initial
Merge branch 'master' of https://github.com/furplag/fantasma

Conflicts:
	README.md