Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work into development
Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work into development
Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work
Merge branch 'development' of https://github.com/vitalbone/WDI_SYD_7_Work
Completed HW
Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work into development
Lastest version subwaylastest.rb
Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work
Half-way through HW
Merge branch 'development' of https://github.com/vitalbone/WDI_SYD_7_Work
Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work into development
files
Added stuff
starting HW
Merge branch 'development' of https://github.com/pdhancock/WDI_SYD_7_Work
update happitrails
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