shock-client
Merge pull request #52 from jaredwilkening/master

shock-client