initial commit
Merge branch 'master' of https://github.com/carllcombs/hammock

Conflicts:
	bower.json