WIP
Merge branch 'master' of https://github.com/palimpsests/timeSeriesVisualizer

Conflicts:
	src/login.js