Removed the project in the bin
new update
khvkyf
Merge branch 'origin/master'

Conflicts:
	Code/src/TimeManagerView.java