mvcth248
Merge branch 'master' of https://github.com/gullipillib/thunter

Conflicts:
	Views/Home/Index1.aspx
	Views/Play/play.aspx