initial commit
Initial commit
Initial commit.
Merge branch 'master' of https://github.com/txinto/functionality

Conflicts:
	.gitignore