Merge branch 'gallery-bb' of github.com:trvrfrd/trvrgur into gallery-bb

Conflicts:
	README.md
Merge branch 'gallery-bb' of github.com:trvrfrd/trvrgur into gallery-bb