Modified makefile. Now compiles correctly.
Merge branch 'work' of https://github.com/nh0815/230-07 into work