Create Area.cpp
Update Geometry.h
Update Volume.cpp
Update Volume.cpp
Changed .gitignore to make merging and commiting easier. Now it ignores
Code::Blocks project files.
Merge branch 'Test-Branch'

Conflicts:
	.gitignore
	Geometry.h
	Volume.cpp

Trying to merge our branches.