added bower
merge conflicts