testing
Merge branch 'master' of https://github.com/pomme190891/FinalYearProject

Conflicts:
	FinPlanWeb/Controllers/CheckOutController.cs