adding somewhat broken code so that scott can fix it

Client landing is broken
Merge branch 'master' of https://github.com/joubin/CSC191

Merging

merging