Spike condition changed
Other unwanted files
Merge remote-tracking branch 'origin/master'

Conflicts:
	TradingAgent/.classpath