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

Conflicts:
	CricketRegistrationApp/app/views/players/edit.html.erb