primer commit
Merge branch 'master' of github.com:jgab-net/access-role

Conflicts:
	.gitignore