Added zhiyoong snsv2
Merge branch 'master' of https://github.com/lab11/M-ulator
031314 For laptop2 set up
Merge branch 'master' of https://github.com/lab11/M-ulator