minor change
merged with pooja
properties file re-direct problem again
merged with master branch, numerous small conflicts
Merge branch 'pooja' of github.com:CIDARLAB/igem-datasheet into pooja
Merge branch 'master' of github.com:CIDARLAB/igem-datasheet into pooja
numerous changes to the web pages
merging master with work on Pooja's branch on web pages