Removing bower.json 

Unnecessary file.
Added in the delete functionality
Resolving merge conflic