Initial commit
remove portal from the git repo. it has its own repo
Merge branch 'master' of github.com:ethanwelborn/hubbub-apps
moving files around so everything is configured correctly
Merge branch 'master' of heroku.com:ethanwelborn-hubbub into production

Conflicts:
	.DS_Store
	.gitignore
	Gruntfile.js
	Procfile
	app.js
	app/Gruntfile.js
	app/Procfile
	app/app.js
	app/bower.json
	bower.json