all now use layout.html
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd6-03-sleepy-bayou