testing initial commit
Merge branch 'master' of github.com:joeghodsi/progress-indicator
testing initial commit to both github and heroku