fixed vote page
fixed merge conflix
changes to index.rb
created profile page
profile page updates
profile page updates
Merge branch 'master' into features