Recovering after rm -r'ing directory
Index.html
Merge branch 'master' of /home/zbanks/grassroots/

Conflicts:
	grassroots.py
	static/js/grass.js
Move testing to external file
Merge branch 'master' of /home/zbanks/grassroots/
Adding jquery dependency
Fix Timing in grass.js
Merge branch 'master' of /home/zbanks/grassroots/

Conflicts:
	static/index.html
Nested objects via lists. Now it's complicated