Rejected commit: Default
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/SimulatorConstants.java
	src/view/ViewModel.java
Merge remote-tracking branch 'origin/master'
Rejected commit: Default