app is working
Merge pull request #18 from schrockblock/feature/bmackall/905pm1212014

app is working