Update Options.cpp to pass linting
Merge branch 'make-us-pass-lint' of https://github.com/kanielc/FlintPlusPlus into dev
Formatting and include refactoring
Merge branch 'dev'