This is going to fuck EVERYTHANG up.  Sorry.
Merge branch 'master' of https://github.com/extrakt/KanyesGameOfLife

Conflicts:
	public/js/main.js
	views/home.jade