modified:   06.rst
	modified:   nanowrimo-2014.ses
Merge branch 'master' of https://github.com/rillonline/writing

Conflicts:
	behind-enemy-lines/06.rst
	behind-enemy-lines/nanowrimo-2014.ses