defore
Merge branch 'master' of https://github.com/igemsoftware/SJTU-Software_2014
Merge pull request #166 from igemsoftware/Victor

Victor
Merge pull request #167 from igemsoftware/master

Victor