fixed error with 12 extra militaryHours at any 12 pm time
removed testing print statement
Merge branch 'conor' into dev
Merge branch 'dev' into conor