added Makefile
settings
fix mistake
Merge pull request #2 from yingted/master

stuff