dfghj
Merge branch 'master' of https://github.com/FinnOConnor/1992dreamteam

Conflicts:
	CricketRegistrationApp/app/controllers/manage_controller.rb
Merge branch 'master' of https://github.com/FinnOConnor/1992dreamteam