some comments added to our models.
Merge branch 'dev' of https://github.com/3divs/OpenRecess into jasonk54
working twilio messaging and reply parsing... still needs to process codes#.
(wip)
fixed merge
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	models/user.js
	routes/index.js
(wip) need to fix .game conflict
Merge pull request #20 from marklee22/master

Fixed login issues
/games populated with map and games
Merge pull request #21 from marklee22/master

Added CSS, Backbone Teams, and Signout
search box added
working game creation with player phone numbers.
Merge branch 'dev' of https://github.com/3divs/OpenRecess into createUser

Conflicts:
	public/js/main.js
added pop-up and able to query database
google maps functionality
Merge branch 'dev' of https://github.com/3divs/OpenRecess into mergeBranch

Conflicts:
	public/js/main.js
	public/stylesheets/style.css
fixed merge conflict
fixing the grunt data to reflect the new schema for invited player phone numbers
updated grunt game file with date and time fields for first game
fully functioning text message generation, process replies, and updating our game collection.