repo field added to package.json
removed bower, added Octicons to /vendor
commit before pull
Merge branch 'master' of github.com:kproj6/front-end
pulled master branch