fix bug from merge conflicts
Merge pull request #236 from BuracayBeach/team2_v5.0b

fix bug from merge conflicts
Added alerts for updating of user
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_Version_2.0