Merge Final version of website into Master

Merging the Final version of my website into Master.