fixed key
Merge branch 'master' of https://github.com/cshunger/sample_app

just want to push