charts
Merge branch 'develop' of github.com:sstarr/journeyapp into develop

Conflicts:
	db/schema.rb