made some changes
Merge branch 'master' of https://github.com/PLT-MAP/map

Conflicts:
	parseTester.py
got rid of conflicts