re-bundled
added styling, hover button for posts on user page
Merge branch 'tjblonsk-master'

Conflicts:
	config/initializers/devise.rb