Fix modal z-index problem
Add circle around power-up item on map
Merge pull request #34 from rohaus/master

Tag animation and disable tagging ability if they are dead
Merge branch 'master' of https://github.com/RebootJeff/phone-tag

Conflicts:
	public/styles/styles.css
	public/views/AppView.js
Remove hidden class from css file
Merge pull request #35 from Ken123777/master

Set up power-up radius to 13 meters and draw a circle around the item
Add icon to buttons in game template
Change event listener to listen to link instead of buttons
Add new icons
Merge branch 'dev'
Merge branch 'master' of https://github.com/RebootJeff/phone-tag

Conflicts:
	public/views/AppView.js