renaming times
Merge branch 'master' of github.com:TIY-Houston-Front-End-Sept-2014/ColorClock

Conflicts:
	js/code2.js