Basic homepage to get us started
conflict merge
Merge branch 'master' of https://github.com/frankbi/food-wasted-youth