Initial commit
merge w/ guthub master
git ignore *.sublime-workspace
resolve conflict with github
Merge branch 'develop' of github-newsappajc:NewsappAJC/gga-api into develop