Comon!
Merge branch 'master' of https://github.com/Theilgaard92/Google_campaign_website

Conflicts:
	app/css/app.css