Undoing a pull
Merge branch 'discover' of github.com:lpachols/appmaker into discover