added a line that says "tried out a new idea"
where did it think the starting point was for this new branch?
fixed to help merge
tried to get a merge to work
made a change in new idea branch adding" this is new idea"
deleted a blank row and ====

Merge branch 'new_idea'

Conflicts:
	scripts/prep_str.R