Reverted a merge by Rachid that deleted all of my files

Should now contain the latest versions of Rachid's code along with the latest version of mine. The drawing demo
still works.