modified:   package.json
	modified:   src/beat_detection.js
	modified:   src/cat_food_nation.js
	modified:   src/create_sin_curve_write_N_read.js
	modified:   src/iterate_mutate_judge.js
	modified:   src/synth_write_read.js
	modified:   src/test_write_wav.js
Merge branch 'master' of github.com:scottstensland/cat-food-nation

Conflicts:
	src/iterate_mutate_judge.js

	modified:   src/cat_food_nation.js
	modified:   src/iterate_mutate_judge.js