(wip)
fixed merge
(wip) need to fix .game conflict
/games populated with map and games
search box added
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
Added user profile page.  Fixed login refresh issue
added sidebar panel
Merge pull request #23 from marklee22/master

Fixed login page refresh issue and added user profile page
Merge branch 'jasonk54' of https://github.com/jasonk54/OpenRecess into jasonk54

Conflicts:
	public/js/collections/Games.js
Added flat-ui images
just added an SMS reply if a user sends more than one rsvp to the same game code.
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev
Removed console.log statement
Merge branch 'dev' of https://github.com/3divs/OpenRecess