ready for Correlation merge
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-correlator
merge ?
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-correlator

Conflicts:
	correlator/templates/show_graphic.mako