Develop

Merges all code from Lorena and I. 
Animation drops (and stops) properly.
Removed the code running Zach's objects (since they weren't doing anything ATM - we can switch to them if needs be later. I didn't remove the files, just the code references in index.html) 

I believe this should be our base before merging Susan's code into connect.js