Before Pull
Giiiiiit!
Merge branch 'master' of https://github.com/osurdml/flame2.0

Conflicts:
	Flame/NeuroAgent.py
	Flame/NeuroAgent.pyc
No edits
Merge branch 'master' of https://github.com/osurdml/flame2.0

Conflicts:
	Flame/NeuroAgent.py
no edits
Merge branch 'master' of https://github.com/osurdml/flame2.0
Visualizing Hotspots, hack