Adjust makefile to reflect new layout
Working on deploying site
Working on deploying site
Working on site
Working on site
Add some messages
Add --no-equalize-means option

Fix #3
Merge branch 'master' into server

Conflicts:
	page/db.py
	page/main.py