added bower.json
Merge branch 'master' of github.com:samvdb/Dojo-Bootstrap

Conflicts:
	bower.json