Updated view

See if committing works
Test again
Merge branch 'Kim'

Conflicts:
	Code/src/TimeManagerMain.java