Committing -> Merging
Merge branch 'master' of https://github.com/Zutazuta/MathGames

Conflicts:
	ProjectDelta.suo
	ProjectDelta/ProjectDelta/Login/Login.cs
	ProjectDelta/ProjectDelta/bin/x86/Debug/ProjectDelta.exe
	ProjectDelta/ProjectDelta/bin/x86/Debug/ProjectDelta.pdb
	ProjectDelta/ProjectDelta/obj/x86/Debug/ProjectDelta.exe
	ProjectDelta/ProjectDelta/obj/x86/Debug/ProjectDelta.pdb