catching errors
Merge branch 'gary' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Joaquin
"catching error merge"
Merge branch 'gary' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Joaquin
updated master for tagging
deleting unused files
Merge branch 'Valeriy' of github.com:jenhantao/UCSD_IGEM
updated readme
added documentation
added joaquins unit tests
Merge branch 'Valeriy' of github.com:jenhantao/UCSD_IGEM
Merge branch 'gary' of github.com:jenhantao/UCSD_IGEM
added the PMID
Added complete database upload form with validation; dynamic plasmid, operon, input transition, input species, and output species fields; and modal error messages. Working on string parser for form.
Merge branch 'Valeriy' of github.com:jenhantao/UCSD_IGEM into gary
Merge branch 'Joaquin' of github.com:jenhantao/UCSD_IGEM into gary
Prepping for pull from Joaquin. Strange behavior in netbeans noted and unknown changes to project.properties.
Merge branch 'gary' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Valeriy
ready to roll, set up server for the upload