Fixed merge error, placed Properties in Configuration.
Merge branch 'master' of https://github.com/samrg472/Modular-Force-Field-System