stash commits
Merge branch 'master' of https://github.com/scottjason/portfolio-site

* 'master' of https://github.com/scottjason/portfolio-site:
  completes glyphicon navbar
moves font awesome out of grunt build
deploys, grunt build passes, retains glyphicons