landing page and assets
Merge branch 'master' of https://github.com/JP-x/hackathon-2 into johnny

Conflicts:
	static/css/style.css
	static/partials/landing.html