minor change
Merge branch 'master' of https://github.com/KrbAlmryde/HW1
Merge branch 'master' of https://github.com/KrbAlmryde/HW1

Conflicts:
	paintdemo_mac/demo.cxx
define pi
define pi
stuff
refactored shit