rebase tests
rebase
Merge branch 'react-version' of https://github.com/theporchrat/dbt-diary-card into react-version

Conflicts:
	src/app.jsx
	src/stores/HistoryStore.js