init
Merge branch 'master' of github.com:benekastah/tj

Conflicts:
	.gitignore