New conflict
Merge branch 'master' of https://github.com/telerik-hqCode-teem/HQCodeProjectTelerikAcademy

Conflicts:
	GameFifteen/GameFifteen.v11.suo
	GameFifteen/GameFifteen/GameFifteen.cs