updated README
Merge branch 'master' of https://github.com/marcusfinney/Koala
fixed merge conflicts