bower added
Merge branch 'working'