splashes
Merge branch 'master' of https://github.com/kwahu/hats

Conflicts:
	Assets/Textures/Splash/art_noir 1.jpg.meta
	Assets/Textures/Splash/art_normal_1b.jpg.meta
	Assets/Textures/Splash/art_western_1.jpg.meta
Merge branch 'master' of https://github.com/kwahu/hats