Resolved conflicts with master branch

examples/DiscPatch/HydroStatic/dynamic.pro

examples/DiscPatch/HydroStatic/makeIC.py

examples/Feedback/feedback.pro

examples/Feedback/feedback.yml

examples/Feedback/makeIC.py

examples/main.c

src/Makefile.am

src/cell.h

src/const.h

src/engine.c

src/engine.h

src/runner.c

src/sourceterms.c

src/sourceterms.h

src/sourceterms/sn_feedback/sn_feedback.h

src/sourceterms/sn_feedback/sn_feedback_struct.h

src/sourceterms_struct.h

src/swift.h

src/task.c

src/task.h