merge conflict prevention
Merge branch 'master' of https://github.com/umass-cs-326/team-kiwi-mango
Queue Service filled out; Simple queue controller nearly complete
Merge branch 'master' of https://github.com/umass-cs-326/team-kiwi-mango
pushing previous Queue items + Fixed DBController syntax issues