updated gitignore
Merge branch 'master' of github.com:zhuhw/myApp