Fixed error
Merge branch 'master' of https://github.com/jargn/app.git