Merge branch 'develop'
Update .gitignore
Updated project structure properly.
Merge branch 'master' into develop