Merge pull request #44 from hall5714/master

Merging backend
Merge branch 'master' of github.com:ui-cs383/Freedom-Galaxy