stupid thumbs
Idk what this is
Merge remote-tracking branch 'origin/master'

Conflicts:
	Kristina/Thumbs.db
	Thumbs.db