merge
Merge branch 'master' of https://github.com/crockct/trans-network

Conflicts:
	stories.html