updated main
Merge branch 'master' of https://github.com/ajjoyal01/Graphics

Conflicts:
	Project3/Project3/main.cpp