delete old bower file
Merge remote-tracking branch 'origin/master'
Import angularjs and jasmine (testing)