working with server on Mac
Merge branch 'master' of https://github.com/thangpqfuhl/homeworktracker

Conflicts:
	www/statistics.html