Order History Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainpage.php
Merge branch 'master' of https://github.com/davidteofilovic/CS275
Merge branch 'master' of https://github.com/davidteofilovic/CS275