added null returns
Merge branch 'martin' of https://github.com/CS180Fall2014/UcrRunner into
martin

Conflicts:
	app/src/main/java/com/murraycole/ucrrunner/view/MapProvider.java