test commit
Merge branch 'master' of https://github.com/team7maslab/maslab-staff-2013
updated simpleserial
fixed merge errors