added greenflash.html
Merge branch 'master' of github.com:calvinwchan/HoppyApp

Conflicts:
	js/javascript.js
	result.html
Merge branch 'master' of github.com:calvinwchan/HoppyApp