Initial import
Merge branch 'master' of github.com:gdg-x/firefly

Conflicts:
	.gitignore