ignore uploads folder
Stylesheets
Merge branch 'styles' into develop