Home page
Home Page 2
Merge pull request #13 from capms/home_page

Home page
fixed conflicts