Merge pull request #42 from garrettlord/master

Updating masaaved with end of sprint 2
Added scramble_helper and rest of scramble logic should be done. Started working on a test file.
Merge branch 'masaaved' of https://github.com/garrettlord/TSP_Project
Including test files
update of my code and test file
Partial complete of Scramble Helper
Fixed random confict in Gemlock
Fixing logic...
Merge pull request #49 from garrettlord/btgaffor

adds most of polling, only thing left is processing responses
Added MTU dorms menu API
Merge branch 'master' of https://github.com/garrettlord/TSP_Project
Adding food API (again)
Debugged scramble code
Merge branch 'masaaved' of github.com:garrettlord/TSP_Project into kevin
Finished version of Scramble game for demo
Merge branch 'master' of https://github.com/garrettlord/TSP_Project into masaaved
fixes the group messaging bug
adds debug statements for polling
changed message length to 160
fixes navbar, adds poll responding