Theme Cookie Stuff
Merge branch 'master' of https://github.com/d4-ideas/Roshambattle

Conflicts:
	public/js/main.js