Changes for User Registration and Student Upload
Merge branch 'master' of https://github.com/mwitt8178/CI

Merge with master