fixing bad merge in project file
fixing bad merge in project file

Worthaboutapig/SquishIt,0liver/SquishIt,wolfgang42/SquishIt,Worthaboutapig/AC-SquishIt,0liver/SquishIt,AlexCuse/SquishIt,wolfgang42/SquishIt,Worthaboutapig/SquishIt,wolfgang42/SquishIt,AlexCuse/SquishIt,jetheredge/SquishIt,AlexCuse/SquishIt,AlexCuse/SquishIt,farans/SquishIt,wolfgang42/SquishIt,Worthaboutapig/SquishIt,jetheredge/SquishIt,farans/SquishIt,farans/SquishIt,Worthaboutapig/AC-SquishIt,Worthaboutapig/SquishIt,farans/SquishIt,AlexCuse/SquishIt,AlexCuse/SquishIt,Worthaboutapig/AC-SquishIt,jetheredge/SquishIt,Worthaboutapig/AC-SquishIt,0liver/SquishIt,farans/SquishIt,0liver/SquishIt,jetheredge/SquishIt,wolfgang42/SquishIt,0liver/SquishIt,Worthaboutapig/SquishIt,jetheredge/SquishIt,jetheredge/SquishIt,Worthaboutapig/AC-SquishIt