First version of site ready
Clean old stuff
Fix post to have correct info
Fix merge conflict with index.html