little change
Merge branch 'master' of https://github.com/osurdml/flame2.0
getting new stuff to work
Merge branch 'master' of https://github.com/osurdml/flame2.0