Merge pull request #24 from rohaus/master

Customize map - limit zoom and custom markers
Remove player's marker when quit
Merge branch 'devSocket'

Conflicts:
	config/socket/socket.js
	public/models/map.js
Merge pull request #25 from Ken123777/master

Remove player's marker from the map upon leaving
Remove extra google maps script tag
Add tag player socket logic
Add tag player logic on the client side
Add tag player logic to communicate with server tag play logic and change icons based on death status
Trigger tag on the game model when tag is clicked
Pass game model to the mapView
Set map as a property of the game model
Add death png files
Merge branch 'master' of https://github.com/RebootJeff/phone-tag

Conflicts:
	public/models/map.js