Merge branch 'master' of https://github.com/ottenkoop/FirstWeekApp

Conflicts:
app/views/layouts/application.html.slim
Merge branch 'master' of https://github.com/ottenkoop/FirstWeekApp