added some file to ignore
Merge branch 'master' of github.com:acmorgan/cop3503project
Merge branch 'master' of github.com:acmorgan/cop3503project
updated cmakelists