Merge remote-tracking branch 'Branch/master'
Enter mock object is created
Synchronize with newest version
Merge pull request #16 from jereneal20/master

Sync
Indentation fixed
Merge pull request #17 from jereneal20/master

Indentation fixed
Merge remote-tracking branch 'test/master'

Conflicts:
	Elevator.java