started merging develop to master
Merge branch 'master' into adding_opt
Resolved conflicts.
Added test_optimization.py
BUG: change name of argument in gen_rts to be compatiable with gen_rand_data
Merge branch 'adding_opt'