fixing bower version
Bumping bower to 1.2.1
Fixing Merge conflict with bower version
Merge pull request #34 from seanzx85/master

Fix bower