Merge branch 'master' into Mike

Conflicts:
	Andrea's Cool App/index.html
	Andrea's Cool App/name.js