Merge branch 'tjblonsk-master'

Conflicts:
	config/initializers/devise.rb
added down arrow 'show comments button'