change README
fix bugs to work
update from origin/develop
delete conflict part
Merge pull request #2 from lengkaka/develop

Develop