Adding stamp collector
Merge branch 'master' of https://github.com/gitah/fb-hackathon

Conflicts:
	src/components/EditSlide.js