Just updated that file mate.
Merge branch 'master' of github.com:fourmackems/borisbikes

Conflicts:
	lib/person.rb