date display issue
Merge branch 'master' of https://github.com/cheeseWeed/cs2450