Initial Commit
Merge branch 'master' of https://github.com/codedecay/familly

Conflicts:
	.gitignore