Added in and out functions to bounding boxes
Merge branch 'master' of github.com:ChiTheHotDogGuy11/WatershedExhibit

Conflicts:
	public/stylesheets/screen.css