Preliminary Admin, Student
Merge pull request #8 from spirnuise/master

Preliminary Admin, Student