fix inte
Merge branch 'master' of https://github.com/ggueno/projecteel

Conflicts:
	static/css/style.css
fix inte landingpage