Fix done
spring 1 done
Merge branch 'sprint1'

Conflicts:
	src/com/calc/CalculatorDemo.java
sprint 2
check
Merge branch 'fix2' into sprint2