Fiat Lux!
Merge branch 'master' of github.com:lostbean/xfunky

Conflicts:
	LICENSE