makefile working
Merge branch 'master' of https://github.com/DKLoehr/Complex-Paint
Designed parser.