Some improvements

Hey there (:
When I wanted to compile CapitalBe in my VM, some things seemed to be broken.

First i fixed two includes in the headers, because the files where somewhere else.
Later it still wasn't compiling for me due to an ambiguity with make_color functions, so I commented the one in source out. I am not sure whether happens on x86 as well.
Last but not least, I added a Makefile to compile the program more easily.