first commit
modified README
a bunch of changes
Merge branch 'develop'