bower
Merge branch 'master' of https://github.com/casesandberg/gridlock

Conflicts:
	gridlock/packages/.gitignore
bower?
Merge branch 'master' of https://github.com/casesandberg/gridlock