Minor makefile change
Added macros to Makefile
Added class functionality
Merge branch 'chan' of github.com:cse20212ssb/SuperSmashBrothers into chan

Conflicts:
	log.txt