Save unready changes
Merge branch 'master' of https://github.com/melak47/Fishy

Conflicts:
	.gitignore
	Fishy.sln
	Fishy/Fishy.vcxproj.filters
	Fishy/Fishy.vcxproj.user