for gary to pull
Merge branch 'Valeriy' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Valeriy