Fixed clock hours display at 12 (AM and PM)
Merge branch 'dev' of https://github.com/HarkerDev/bellschedule into dev

Conflicts:
	script.js