componentized app
Merge branch 'master' of github.com:bricecarpentier/pushy

Conflicts:
	app/index.js