Updated Jquery --> 1.10.1 (except not magic-cal.me)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
ETS layout changes. Work in progress. Removed extraneous images.
Added lightbox for chart. Changed copy for chart. Added slideshow for index.
edited ETS index page.
Added text model (doc)
Wrote CRUD for docs (/create, /view, /edit, /delete)
Doc save/load