Removed unnecessary #include and #define statements.
Merge branch 'master' of https://github.com/hue03/CS3243October.git