fix conflicts

.gitignore

Gemfile

Gemfile.lock

...ets/fonts/Basier-Square/basiersquare-semibold-webfont.eot

...ets/fonts/Basier-Square/basiersquare-semibold-webfont.ttf

...ts/fonts/Basier-Square/basiersquare-semibold-webfont.woff

...s/fonts/Basier-Square/basiersquare-semibold-webfont.woff2

...nts/Basier-Square/basiersquare-semibolditalic-webfont.eot

...nts/Basier-Square/basiersquare-semibolditalic-webfont.ttf

...ts/Basier-Square/basiersquare-semibolditalic-webfont.woff

...s/Basier-Square/basiersquare-semibolditalic-webfont.woff2

app/assets/images/admin/administration-thumb.jpg

app/assets/images/admin/administration.jpg

app/assets/images/admin/communication-thumb.jpg

app/assets/images/admin/communication.jpg

app/assets/images/admin/education-thumb.jpg

app/assets/images/admin/education.jpg

app/assets/images/admin/research-thumb.jpg

app/assets/images/admin/research.jpg

app/assets/images/admin/research/hal-thumb.jpg