Fixed some inconsistancies.
Merge remote-tracking branch 'CodyHoward/master'
Merge remote-tracking branch 'Sam/master'
Added onClick handler for Back to Teacher Main Page.  There's a note to
handle the other buttons once the pages they link to are up and running.