work in progress admin stuff
conflicts
Merge branch 'master' into admin

Conflicts:
	.gitignore
admin users
additions for admin stuff
Merge pull request #3 from thogg4/admin

admin users section