Merge pull request #11 from jkru/master

reconcile
Merge pull request #12 from jkru/master

latest version of milksahre.py, the database, and a couple updated html ...
added/fixed edit profile function
Merge pull request #15 from lzhou89/master

linda's update to the change profile page