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

Conflicts:
	index.html