6

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

Conflicts:
	LoanTracker/LoanTracker/DetailsViewController.h
	LoanTracker/LoanTracker/ListViewContoroller.h
7

7