Merge branch 'master' of https://github.com/binoculars/HooHack2014

Conflicts:
	.gitignore
	bin/www