merging constants.h
merge complete
Merge branch 'master' of github.com:skeswa/jasp-client
Merged a boo boo
Cleaned up receiver a little