first commit
conflict solved
conflict solved v2
readme file
Merge pull request #18 from vincent178/master

READY: fix conflict in readme file