Merge branch 'master' of https://github.com/jonhassall/AdvancedSoftwareEngineeringSOFT40051

Conflicts:
	Visual Studio 2013/projects/Inheritance1/Debug/Inheritance1.exe
	Visual Studio 2013/projects/Inheritance1/Debug/Inheritance1.ilk
	Visual Studio 2013/projects/Inheritance1/Debug/Inheritance1.pdb
	Visual Studio 2013/projects/Inheritance1/Inheritance1.sdf
	Visual Studio 2013/projects/Inheritance1/Inheritance1.v12.suo
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Animal.cpp
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Animal.h
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Cat.cpp
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Cat.h
	Visual Studio 2013/projects/Inheritance1/Inheritance1/ClassDiagram.cd
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Animal.obj
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Cat.obj
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Inheritance1.log
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Inheritance1.tlog/CL.read.1.tlog
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Inheritance1.tlog/CL.write.1.tlog
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Inheritance1.tlog/link.read.1.tlog
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Main.obj
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/Monkey.obj
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/vc120.idb
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Debug/vc120.pdb
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Main.cpp
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Monkey.cpp
	Visual Studio 2013/projects/Inheritance1/Inheritance1/Monkey.h