merging the pull
Merge branch 'master' of https://github.com/shawnaspoor/cscie56-finalproject
controller, services, gsp all being created to work together for basic implementation