Finished static-page
resolved conflict
resolved conflict
Merge branch 'master' into filling-in-layout
Changes in home view -- no title
Partial view added
Added partial view
Finished layout and routes