added public/uploads to .gitignore
Merge branch 'master' of https://github.com/schuppo/kannankulam