fixed variable names to be more consistent (underscores!)
Merge branch 'master' of
https://github.com/sessionista/ReinEvent-Map.git

Conflicts:
	src/ReinEvent.py