Code Updates

YEesaaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test3/www/home.html
	src/test3/www/js/index.js