Added custom registration form styles
Added first and last name to registration form
Changed gender field to CharField
Added editing of user profile
Removed commented code
Added ability to upload avatar pictures
Added sorting of questions by popularity
Fixed search bug and added temp (unworking) stats
Resolved conflicts
Resolved merge conflict
Merge branch 'master' of https://github.com/pollstagram/pollstagram