Merge branch 'master' of heroku.com:watarefriends into sublet

Conflicts:
	programs.py
	templates/about.html
	templates/index.html