Committing to Discard these changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cube.cpp
	Cube.h
	Main.cpp