Merge pull request #10 from CharmlessCoin/master

New Makefile Structure
Updated Makefile
Merging stuff
Updated makefile