update
make sure bower is around
Merge branch 'master' of github.com:sndrs/guardian-container-prototype

Conflicts:
	bower.json