.
Commit Sandbox
Commit sandbox
commit
Merge branch 'master' of https://github.com/uqar-ludic/ludic

Conflicts:
	Ludic/Gui/SiteSandBox/SiteSandBox/App_Data/SandBox.mdf
	Ludic/Gui/SiteSandBox/SiteSandBox/App_Data/SandBox_log.ldf
	Ludic/Gui/SiteSandBox/SiteSandBox/bin/SiteSandBox.dll
	Ludic/Gui/SiteSandBox/SiteSandBox/bin/SiteSandBox.pdb
	Ludic/Gui/SiteSandBox/SiteSandBox/obj/Debug/SiteSandBox.dll
	Ludic/Gui/SiteSandBox/SiteSandBox/obj/Debug/SiteSandBox.pdb