test
Merge branch 'master' of https://github.com/ahoward/ro

Conflicts:
	ro/people/ara/bio.md.erb
message
Merge branch 'master' of https://github.com/ahoward/ro

Conflicts:
	ro/people/ara/bio.md.erb