Workspace
Merge branch 'master' of github.com:sameg14/resque-demo

Conflicts:
	.idea/workspace.xml