Alec test 3
Merge branch 'master' of https://github.com/alecwilcox/Loaner

Conflicts:
	LoanTracker/.DS_Store
	LoanTracker/LoanTracker/MainView.h