lidtmereforstand
Conflict resolve
Merge branch 'temp'

Conflicts:
	FormationGame/Controllers/SejeKariController.cs
Merge branch 'master' of https://github.com/kparkov/Formation