Client merge complete
Merge pull request #1 from JesseFarebro/client-merge

Client merge complete