Removing stuff
Merge branch 'master' of github.com:seanhagen/bbtv-lobby-projector

Conflicts:
	app/scripts/main.coffee