'bio on profile' feature. Ping to Marcelo to add bio field on edit page.
ping to jeff: building form for user's bio
'bio on profile' feature. Ping to Marcelo to refactor no bio present scenario.
playing with no bio
playing with no bio
failing autograder cuke test. pulling from upstream to get latest code
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into bio_on_user_profile1
final fixes to rspecs
Merge pull request #307 from coloradobum/bio_on_user_profile

Bio on user profile
added check for nil input to markdown rendering, added tests for nil input
Merge pull request #308 from yggie/fixes-for-articles

Fix for Articles
wrapped CodeRay.scan(...).div in a begin-rescue statement, create markdown engine on the fly
added test for the weird locale missing issue
added plaintext fallback option
Merge pull request #309 from yggie/fixes-for-articles

Wrapped failing code in begin-rescue
Merge branch 'develop' of https://github.com/sampritipanda/WebsiteOne into static_pages

Conflicts:
	db/schema.rb