Merge pull request #11 from gtallen1187/master

merging into production
bower
bower badge
Merge pull request #12 from gtallen1187/develop

Develop