more grafitti
Merge branch 'develop' of github.com:harvard-lil/linky into develop

Merging vandalism

Conflicts:
	django/linky/templates/about.html
Merge branch 'develop' of github.com:harvard-lil/linky into develop