makefile
Merge branch 'master' of https://github.com/treziapov/cs414
added gtk compilation to makefiles
Merge branch 'master' of https://github.com/treziapov/cs414