changes and Merge branch 'master' of https://github.com/dominicglenn/hackathon

Conflicts:
	static/scss/main.scss
	static/scss/styles.scss
Merge branch 'master' of https://github.com/dominicglenn/hackathon
new styles
ignore generated main and style files