Edited Makefile stuff
Nana's shove.
Sunday morning
Done with problem 2.
Merge branch 'feature-0.2.2'