image upload
added public in .gitignore
added public in .gitignore
conflicts resolved
Merge pull request #10 from afrahkariyadan/master

conflicts resolved