Makefile update
Merge branch 'master' of https://www.github.com/glor/assignment
"We do what me must, because we can!"