pat;s stuff
Merge branch 'master' of https://github.com/patkira/server_side_assignment
fix html