Brought Master branch up to date

Master branch now has the minimum required files to run the website.