removing a few commented out stuff
fixing merge confilit
Merge pull request #35 from GJST-Capstone/gregory

Gregory