Merge branch 'master' of github.com:jwinder/jwinder.io
bower.json testing
Merge branch 'master' of github.com:jwinder/jwinder.io