update ignore
fixed some left merge problem
Merge pull request #19 from yankforce/master

continue merge and make it works