Syncing github index.html to local version
Merge branch 'master' of github.com:jadesign123/myapp

Conflicts:
	www/index.html