small change test
ignore
getting rid of extraneous jquery
getting rid of extraneous jquery
removing more extra jquery
Untertool Temp Setup
Merge branch 'jon' into sprint5
small change to test out SSL
untertool updates
Merge branch 'jon' into sprint5
reference added
Merge branch 'marcia' into sprint5

Conflicts:
	agdrift/__init__.pyc
Stylesheet Fixes & Collapsbile Output Table example
jQuery Library: Collapsible
Merge branch 'jon' into sprint5
Terrplant object completed, need to wire terrplant_model dependencies and testing to the object
Adding Terrplant object back into master, still need to hook into it with model and tests
therps django everything
add new files
Merge branch 'tao' into sprint5