initial
init
Merge branch 'master' of https://github.com/bman917/user_manager

Conflicts:
	.gitignore