animation working
Merge branch 'master' of https://github.com/ChiTheHotDogGuy11/WatershedExhibit

Conflicts:
	public/app.js