Merge branch 'master' of https://github.com/OWZG/furry

Conflicts:
	.gitignore
Initial commit