laptop

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

Conflicts:
	WindowsApplication2/WindowsApplication2.suo

Signed-off-by: Hubert Cross <hubert@tropez.org>