updated Makefile, cycles.c
committing changes to basic_experiment, to be overwritten by next pull
resolved conflicts in basic_experiment