Added integration code. Also added node_modules to git ignore because it causes issues with running the server
Merge branch 'master' of github.com:ChiTheHotDogGuy11/WatershedExhibit

Conflicts:
	public/app.js