life
Merge branch 'Dev' of https://github.com/seokbeomKim/fastfoodTycoon into Dev

Conflicts:
	FFTycoon/FFTycoon/FFTycoon.csproj
	FFTycoon/FFTycoon/Properties/Resources.Designer.cs
	FFTycoon/FFTycoon/Properties/Resources.resx