completed code
Merge branch 'master' of https://github.com/jmarcinik/CS275L3

Conflicts:
	ParkingLotTracker/gen/com/cs275/parkinglottracker/R.java
	ParkingLotTracker/src/com/cs275/parkinglottracker/AddLot.java