phil keeps removing essential html
Merge remote-tracking branch 'upstream/master'
attempting to put all assets in the correct directories