update happitrails
update
Completed HW
Merge branch 'development' of https://github.com/pdhancock/WDI_SYD_7_Work

Conflicts:
	w01/d05/phil/happitails/lib/animal.rb
	w01/d05/phil/happitails/lib/application.rb
	w01/d05/phil/happitails/lib/client.rb
	w01/d05/phil/happitails/lib/menu.rb
	w01/d05/phil/happitails/lib/shelter.rb