image uploader almost there
chat room
new
chat and rest
8/9
Merge branch 'master' of https://github.com/nateguy/tweettube

Conflicts:
	.DS_Store
	.meteor/packages
	client/.DS_Store
	client/js/edit/edit.coffee
	client/js/registration/registration.coffee
	client/stylesheets/fonts.import.less
	client/views/.DS_Store
	client/views/blab/blab.html
	client/views/blab/message.html
	client/views/blab/message_box.html
	client/views/edit/edit.html
	client/views/login/login.html
	client/views/registration/registration.html
	client/views/tweet/tweet.html
	lib/router.coffee
	packages/.gitignore
	server/publications/messages.coffee
	server/publications/onlineusers.coffee
	smart.json
	smart.lock
friday evening nathan
12am
nathan
might nathan
TV schedule auto updates. Can click on each program and info will show on chatroom
nathan monday
fixed navbar
stuff
Merge branch 'master' of https://github.com/mluus/tweettube into mluus-master

Conflicts:
	.meteor/packages
	client/js/blab/blab.coffee
	client/js/edit/edit.coffee
	client/js/registration/registration.coffee
	client/js/tweet/tv.coffee
	client/stylesheets/blab.less
	client/stylesheets/tweettube.less
	client/views/blab/blab.html
	client/views/blab/message.html
	client/views/blab/reply_box.html
	client/views/edit/edit.html
	client/views/navbar/navbar.html
	client/views/registration/registration.html
	client/views/test/addchannel.html
	client/views/tweet/channel.html
	client/views/tweet/program.html
	client/views/tweet/tweet.html
	client/views/tweettube.html
	lib/router.coffee
	packages/.gitignore
	server/publications/messages.coffee
	smart.json
	smart.lock
Merge branch 'mluus-master'
added api