added app
Merge branch 'master' of github.com:BrianGuo/Json_Project
merging app