Merge remote-tracking branch 'origin/master' into LC
Merge pull request #125 from igemsoftware/master

Update
Merge branch 'LC' of https://github.com/igemsoftware/SJTU-Software_2014 into LC
modify bar
Merge pull request #126 from igemsoftware/LC

bar modification