All the stuff that got deleted...whoops
Logic is coming together
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	resources/client-logic.js
	resources/server-logic.nut
	resources/style.css