Merge branch 'master' into nightly
fixed something
fixed bug
Merge branch 'nightly' of https://github.com/josephpisciotta/tRON into nightly

Conflicts:
	css/main.css
	index.html
	javascript/tron.js