Project 2

Lets merge project 2 into master.  geolocate has already been merged in to master.