Max server message history
apparently added jake
Merge branch 'ChillyFlashER-master'
Merge branch 'master' of github.com:dcolgan/tomatoestogether

Conflicts:
	README.md
	public/css/vendor.css.map
	public/js/app.js.map
	public/js/vendor.js.map
added gitignore and removed node_modules and public from the repo, they are generated files
actually removed them