Pushing main site
Removed unused files
Merge branch 'master' into site
Fixed messed up merge
Removing old files
Merge branch 'master' into site