gift link
Merge branch 'master' of github.com:nataliepo/gptwdg

Conflicts:
	.gitignore
	views/web.pyc