added colors!!!
resolved merge errors Merge branch 'master' of https://github.com/Musicophilia/hackathon

Conflicts:
	found.html