test
Merge branch 'master' of https://github.com/NathanTheGr8/KwikWall

Conflicts:
	Pictures/home.hype/Thumbnails/1.tiff
	Pictures/home.hype/data.plist