Revert "Base stuff we need"

This reverts commit 24585df1c3f1041e452c5ad24aceefae5f491a55.
Revert "Revert "Base stuff we need""

This reverts commit 3ead1a0a9ca5bcf7ca3661cdccad9666d5c2e5be.
Merge branch 'master' of https://github.com/mmollica/Capstone_Project