Merge pull request #2 from ollieflumeland/master

Additions to Menu.cpp only
Updated calculator class so compiles
Merge branch 'master' of https://github.com/jonathanworth/DistanceFinder into jonathanworth-master

Conflicts:
	Projects/__history/DistanceFinder.cbproj.local.~2~
Merge pull request #7 from jemble/master

final calc stuff