Initial commit
now with bower.json
Merge remote-tracking branch 'upstream/master'