resolved merge conflicts
resolved merge conflicts
Merge branch 'Development' of https://github.com/cgunarto/Instaclone into Development