Changes in correlation analysis
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-correlator

Conflicts:
	correlator/resources.py
	correlator/templates/analysis_result.mako
	correlator/templates/compare.mako
	correlator/views.py