changed *padding to 12
conflict test sean
change back to 0
Merge remote-tracking branch 'origin/master' into sean
pulled in data for submissions and comments

on the profile view
Merge remote-tracking branch 'origin/victor'
fixed popup styling
added validation to forms
pulled in data for votes

on profile page
Merge remote-tracking branch 'origin/master' into sean