(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 sidebar panel
Merge branch 'jasonk54' of https://github.com/jasonk54/OpenRecess into jasonk54

Conflicts:
	public/js/collections/Games.js
Added flat-ui images
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev
Removed console.log statement