Added GUI

Yaaay!!!
Merge branch 'master' of https://github.com/CodeRend/Deitel

Conflicts:
	Shapes/main.cpp
Merged something

Forgot to pull out, so i just merged everything together