initial commit
Merge branch 'master' of https://github.com/ViaoV/efflux

Conflicts:
	.gitignore