kristine advice
Merge branch 'master' of https://github.com/JeffNguyen/COGS-187A

Conflicts:
	_COFFEE/css/style.css
weird converge