sort things
Merge branch 'master' of github.com:jyp/LL

Conflicts:
	Framework.hs
	Popl.hs