commit before merge
commit after solving conflict
Merge pull request #5 from TYC12/master

change the database password to TYC's