Refactored Triangle class to Diamond and cleaned makefile
Merge branch 'master' of http://github.com/roninb/cop3330

Conflicts:
	ass2/date.cpp