merged
anotehr test
name change
Merge branch 'master' of https://github.com/kevinsk/purchasetracker

Conflicts:
	application/controllers/purchases.php