finished merge
Updating: miscellaneous
Updating: renaming some cstream_tokener functions
Updating: improving contrib/SDL2
Updting: improving contrib/SDL2
Updating: improving prelude/integer_fixed
Updting: improving prelude/integer_fixed
Updating: improving contrib/SDL2
Merge remote-tracking branch 'origin/master' into gurobiCleanup
Merge remote-tracking branch 'upstream/master' into gurobiCleanup
Updating: improving contrib/SDL2
Updating: improving contrib/SDL2
Merge remote-tracking branch 'upstream/master' into gurobiCleanup
copied over all gurobi.sats functions, need to implement addconstr