push
sprint 2
bug fixes
Check in removed 
Check out GUI modified
Check in removed 
Check out GUI modified
Merge origin/master

Conflicts:
	src/BLL/BLLTimelist.java
	test/BLL/BLLTimelistTest.java