Updated README, fixed blank message rate limiter issue
Updated humans.txt to include me and ChillyFlashER
Added dooskington emote
Merge pull request #6 from JordanFitz/master

Updated README and humans.txt, added Dooskington emote
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
Fixed clock color issue
Merge remote-tracking branch 'base/master'

Conflicts:
	public/emotes/kappa.png
	public/js/app.js
	public/js/app.js.map
Message Templates
Merge branch 'master' into users

Conflicts:
	public/js/app.js
	public/js/app.js.map
	server.coffee
Users work in progress

Fixed a tempate issue