Merge pull request #1 from lanny1406/master

home page
conflict test
merging changes with lanny1406