fixing up css location and adding html doctype
Merge remote-tracking branch 'origin/master'