work in progress
work in progress
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
work in progress
Clean up
Changed 'username' to 'nick'
added basic users
Merge pull request #7 from ChillyFlashER/master

Fixed clock color issue