More logic changes
Merge branch 'master' of https://github.com/mezderman/hackathon

Conflicts:
	css/styles.css