First commit
Merge branch 'master' of github.com:jbejarano/useradmin

Conflicts:
	.gitignore