merge issues
Merge branch 'master' of github.com:ml242/gp_app
Merge branch 'master' of github.com:ml242/gp_app