Updated view

See if committing works
Test again
Removed the project in the bin
new update
khvkyf
test

this is sercan
test

sercan new
test

from Kim :)
Merge branch 'master'

Conflicts:
	Code/src/TimeManagerMain.java
	Code/src/TimeManagerView.java