working
Merge branch 'not-pop'

Conflicts:
	lib/tasks/sample_data.rake
Merge branch 'master' into not-pop

Trying to replace master!