Initial commit
Merge branch 'master' of https://github.com/triedto/triedto

Conflicts:
	.gitignore