Added bower.json
Merged