Cleaning

Cleaning
Merge branch 'master' of https://github.com/drandx/SE450_FinalProject

Conflicts:
	src/simulator/model/Simple.java
Testing Light Times