more changes
more styling
fixed merge conflict
fixed merge conflict
Merge branch 'styling-feature' into new_develop
Merge branch 'new_develop' of github.com:brittkistner/group-project-base into comment_form
fixed edit account page, added some styling to drag and drop and a remove link for each file