Ignore this
because it is
Merge branch 'master' of https://github.com/SUMDude21/cs378-assignment_2
Put in a file with bullet capabilities
Merge branch 'master' of https://github.com/SUMDude21/cs378-assignment_2

Conflicts:
	Makefile.am