Merge pull request #9 from weejulius/master

add gradle as build tool additionally
Update README.md
fix conflict