Added try-catch blocks to check if number is entered.
Merge origin/master

Conflicts:
	src/consolecalculator/ConsoleCalculator.java