finished user account factory

and update activity code
Merge branch 'master' of https://github.com/stephanwilliams/CS-2340-Project