ok

Signed-off-by: Hubert Cross <hubert@tropez.org>
Merge branch 'master' of https://github.com/hubertUNI/APP_BD_PandaCakes

Conflicts:
	WindowsApplication2/WindowsApplication2.suo
	WindowsApplication2/WindowsApplication2/bin/Debug/WindowsApplication2.exe
	WindowsApplication2/WindowsApplication2/bin/Debug/WindowsApplication2.pdb
	WindowsApplication2/WindowsApplication2/obj/x86/Debug/GenerateResource.read.1.tlog
	WindowsApplication2/WindowsApplication2/obj/x86/Debug/WindowsApplication2.exe
	WindowsApplication2/WindowsApplication2/obj/x86/Debug/WindowsApplication2.pdb