q1
Merge branch 'patch-1' of https://github.com/infinitus/codegolf into infinitus-patch-1

Conflicts:
	q1.md
Merge branch 'infinitus-patch-1'
Merge branch 'master' of github.com:nushackers/codegolf