Added Proximity Analysis
Merge branch 'master' of https://github.com/jscott11/GBATViewer

Conflicts:
	config.json