Week one charts
Morning commit
Commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge complete