Delete everything to reupload files with new structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/script.js
Delete everything to reupload files with new structure