all the things can haz workz
Merge branch 'master' of github.com:hpsin/EECS314

# By Robert S Meyer
# Via Robert S Meyer
* 'master' of github.com:hpsin/EECS314:
  fixed writing the correct time

Conflicts:
	src/file_handling.s