Updated client files #2
Merge pull request #5 from JulieMarie/master

Updated client files #2