Added gitignore
Added bower.json
Fixed conflict