to test
changes
Merge branch 'johnny' of https://github.com/omoman/hackathon-2 into stage
Merge branch 'master' of https://github.com/JP-x/hackathon-2 into johnny

Conflicts:
	static/css/style.css
	static/partials/landing.html
Merge branch 'master' of https://github.com/JP-x/hackathon-2 into johnny

Conflicts:
	static/js/app.js
Merge branch 'johnny' of https://github.com/omoman/hackathon-2 into stage