local
Merge branch 'master' of https://github.com/fagot/SpeakingMania

Conflicts:
	Views/Home/Index.cshtml