Pushing everything we worked on at school
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/temp_vars.php
	lib/User.class.php
menu class