Working client after haxxing regex
Added remotes
Merge remote-tracking branch 'origin/master' into client