Added proj1-1 files
modified makefile
updated Makefile again
changed makefile permissions
lol
Merge branch 'master' of https://github.com/yangyh2011/proj1