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.
merging traverse codes
Improved Lauren's code
debugged Lauren's code
updated sql scripts:
First working model
make a test file for Valerie to test on the server
aa
Kwat's wrote a test code
trying to find files
Merge branch 'Kt-Er' of https://github.com/jenhantao/UCSD_IGEM into Valeriy
Merge branch 'Kt-Er' of github.com:jenhantao/UCSD_iGEM into Valeriy
ignore
rewrote trasversal