Loads of content and formatting changes (ignore the index.html file! i'll redo those)
Fix merge conflicts manually