Edit/Show User Profile
add voting to post
add undo voting to post
add voting and undo voting to post_comment
Merge branch 'master' of https://github.com/jamescheuk514/postit

Conflicts:
	app/assets/stylesheets/main.css.scss
	app/views/posts/_post.html.erb
	app/views/users/show.html.erb