merge
Merge branch 'master' of https://github.com/taggyb/SSSYZ4

Conflicts:
	log/development.log
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
merge
Merge branch 'master' of https://github.com/taggyb/SSSYZ4

Conflicts:
	log/development.log
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
merge
Merge branch 'master' of https://github.com/taggyb/SSSYZ4

Conflicts:
	log/development.log
	tmp/cache/assets/CF0/B10/sprockets%2F6b246f81f813ce8d176e388933b9e11d
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D54/6D0/sprockets%2Fb8f72f6ee0d9169a47e9cf3f8108c741
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
merge
Merge branch 'master' of https://github.com/taggyb/SSSYZ4

Conflicts:
	log/development.log
	tmp/cache/assets/CF0/B10/sprockets%2F6b246f81f813ce8d176e388933b9e11d
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D54/6D0/sprockets%2Fb8f72f6ee0d9169a47e9cf3f8108c741
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
Merge branch 'master' of https://github.com/taggyb/SSSYZ4
some minor changes