added fedora box
Merge branch 'master' into fedora-box

Conflicts:
	.gitignore