not sure what changed
yolo
Merge branch 'master' into braden
begun the conversion to header.php I managed to get the buttons to load where i want them
Merge branch 'braden' into GUI

Conflicts:
	src/classes/mockout/mocklog.txt