moved all pages into one html for easier transitions and experience
Merge remote-tracking branch 'origin/master'