better colors
Merge branch 'dev' of https://github.com/CSE512-14W/a3-chaoyu-aniket into dev

Conflicts:
	include/js/main.js