Switched to CMake
Merge branch 'master' of github.com:joar/c

Conflicts:
	Makefile