Tweaking JSON and img carousel.
Merge branch 'Valeriy' of https://github.com/jenhantao/UCSD_IGEM into gary_branch
resolved Valeriy merge issues
prepping for merge with KP
Merge with KP
Readying for pull from master. Edited app JSON format.
Post-pull merge. Fixed master's merge errors in cynet app.
Building stylesheet for app.
pull from master
Replaced deleted file. Making model methods more dynamic.
servlet stuff which contains executing kwattest.py
json for login
sql codes cleaned up
improved graphing
working on the mapping to the plasmids
refilling database, 60% done
MERGED! FUCK YES
3:45
making module and documentation for parser
making module and documentation for parser