Here goes the sausage.
Merge branch 'master' of https://github.com/extrakt/KanyesGameOfLife

Conflicts:
	public/js/main.js