Various Updates
Merge branch 'master' of https://github.com/patil215/codeday-austin

Conflicts:
	www/test.html