formatted file, altered headers and such to make it sit slightly better
changed p tags to divs
Merge remote-tracking branch 'origin/experimental' into experimental