Merge branch 'master' of https://gist.github.com/9163096191a167fa002b

Conflicts:
	gistfile1.txt