Changes to purchase controller and model
Merge branch 'master' of https://github.com/gswetha/cs2102

Conflicts:
	application/models/purchase_model.php
update UI integration