added additional pages and cleaned up code
Merge github.com:tmccoy/sad

Conflicts:
	app/__init__.pyc
	app/login_page.pyc
	server.py
	wsgi.py
	wsgi.pyc