makefile added
Merge branch 'master' of https://github.com/mrojass/COP4610-Proj2