Add home-page
Merge branch 'home-page' of https://github.com/ChuBaka13321/to-do-list
Create nasty merge conflict