Maps
Merge branch 'master' of https://github.com/rascheel/Cpre388Project

Conflicts:
	src/iastate/edu/tooltray/MainActivity.java