Edited html for the construction phase
Fixed minor problems
minor bug fix for merging
Fixed and merged site