Merge remote-tracking branch 'origin/Sheldons_branch' into Aaron's_Branch
Merged to view current site
Attempt to merge branches
Merge branch 'master' of https://github.com/jamesamac/DEV302 into Aaron's_Branch
Working Register and Log-In system, with updating password on each log in.
beginning admin access