added navbar
adding grid
added grid in schedule
added grid and accordion
picture uploader working somewhat
added image uploader
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