updated Makefile and display.c
''
Merge branch 'master' of https://github.com/dsreyes1014/w2c