front page design
Merge branch 'master' of github.com:stiucsib86/happiness-app