added update_profile.php, added 2 functions to profile_page_functions.php
Merge branch 'master' of github.com:osterbit/cs361_project_b
test merge
try 2