pray
Merge branch 'master' of https://github.com/funtrix/exjobb

Conflicts:
	js/app.js
	scss/_settings.scss
	scss/app.scss