bm page working, no sql queries though

The pages are layed out as they should, and wokring properly, but none
of them have correct sql queries returned
Merge branch 'master' of https://github.com/dfranc3373/CSProject

Conflicts:
	smarty/templates/home/bm/a_course_history.tpl

	smarty/templates_c/7ead31daae276cbfdda2e579f150332a12e00e06.file.a_course_history.tpl.php

	smarty/templates_c/cb5bca08491ee1c6f64408ba7421ccb304382361.file.index.tpl.php
	www/home/bm/a_course_history.php