Finish layout and routes2
Finish layout and routes on master
remove public/index.html on static-pages
Merge branch 'static-pages'
remove public/index.html on filling-in-layout
Merge branch 'filling-in-layout'