bower adds
Merge pull request #9 from draycox/new_branch

bower adds
Merge branch 'joey6'
Merging Joeys
updates to bower stuff
Merge pull request #10 from draycox/master

getting everything up to date