calc square
fix merge conflicts
Merge branch 'mxmo0rhuhn-master'
split client and actor
add response queue
clean up