added edit from nano
Merge branch 'master' of https://github.com/craigjwillis/tokyobeachclub

Conflicts:
	README