gfwerfewrgerger
Nicks changes
Merge branch 'master' of https://github.com/zaccolley/pubhack2

Conflicts:
	css/all.scss
	css/build/style.css
	css/build/style.min.css
	index.html
	js/build/script.js
	js/build/script.map.js
	js/build/script.min.js
	js/game.js
	js/scripts.js
Merge branch 'master' of https://github.com/zaccolley/pubhack2

Conflicts:
	index.html