Updated bower.json
Merge branch 'master' of https://github.com/xypaul/settingz.js

Conflicts:
	bower.json