added to bottom of css for 12-hour option
update for 12-hour option
Merge pull request #14 from ericop/12-hour-branch

12 hour branch
Build after merge
Merge remote-tracking branch 'origin/master' into gh-pages