update
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014