changed time to military format
testing if commit went in
Merge branch 'master' of https://github.com/cadams32/CS4400-Final.git