styling tests
Merge branch 'master' of https://github.com/retani/wwhs

Conflicts:
	app/models/user_biography.rb
Merge branch 'master' of https://github.com/retani/wwhs