change
wadasd

Conflicts:
	app/css/app.css
Merge branch 'contact-page' of https://github.com/Theilgaard92/test_1 into contact-page