Cleaned up code a little

weebit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test3/www/js/index.js
Merge branch 'master' of https://github.com/hilts-vaughan/railgun