updated media gitignore to ignore assets
Merge branch 'master' into dev
removed media and static folders