Minor changes to View
Merge branch 'master' of https://github.com/janvillarosa/ststat-project

Conflicts:
	STSTATProject/build/classes/ststatproject/CalculatorView.class