upd

Signed-off-by: Michal Hanajík <michal.hanajik@netbizsolutions.sk>
Merge branch 'master' of https://github.com/Tabetha/hell-coders-school

Conflicts:
	HellCoders.v12.suo
	HellCoders/HellCoders.csproj
	HellCoders/bin/Debug/HellCoders.exe
	HellCoders/bin/Debug/HellCoders.pdb
	HellCoders/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	HellCoders/obj/Debug/HellCoders.csproj.FileListAbsolute.txt
	HellCoders/obj/Debug/HellCoders.exe
	HellCoders/obj/Debug/HellCoders.g.resources
	HellCoders/obj/Debug/HellCoders.pdb
	HellCoders/obj/Debug/HellCoders_MarkupCompile.cache
	HellCoders/obj/Debug/HellCoders_MarkupCompile.i.cache
	HellCoders/obj/Debug/Resources/Windows/MainWindow.baml
	HellCoders/obj/Debug/Resources/Windows/MainWindow.g.cs
	HellCoders/obj/Debug/Resources/Windows/MainWindow.g.i.cs

Signed-off-by: Michal Hanajík <michal.hanajik@netbizsolutions.sk>