home page revamped
merge conflicts resolved