First commit
Merge branch 'master' of https://github.com/bryanjroy/trustrose

Conflicts:
	.gitignore