Test3

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

Conflicts:
	LoanTracker/LoanTracker/MainView.h
4

4
Merge branch 'master' of https://github.com/alecwilcox/Loaner

Conflicts:
	LoanTracker/LoanTracker/MainView.h
5

5
Merge branch 'master' of https://github.com/alecwilcox/Loaner