clean up
add /public/.../src ti .gitignore
Merge branch 'develop'