asd
Merge branch 'master' of https://github.com/IVProductions/PinMe

Conflicts:
	.idea/workspace.xml
	app/controllers/mapCtrl.js