worked on analysis
Merge remote-tracking branch 'origin/master'

Conflicts:
	nifty/analysis.py