Cleared tmp files, removed construction page, routed home page to actual home page
Resolved merge conflict