Merge commit
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-correlator
Refactoring
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-correlator

Conflicts:
	correlator/resources.py
	correlator/templates/show_graphic.mako