basic setup
modified bower.json
touched README
fixed conflicts?