fixes
Merge branch 'master' of https://github.com/eddis/cs1555
fix time screen
more changes
Merge branch 'master' of https://github.com/griffy/cs1555