Combined merid(am/pm) and hour into 1 function

Rewrote Date.getMerid and Date.getHoursTwoDigits