Removed binary, fix app
Merge branch 'master' of https://github.com/Archiix/chifoumi

Conflicts:
	Chifoumi.sdf
	Chifoumi.v12.suo
	Chifoumi/Chifoumi.cpp
	Chifoumi/Debug/Chifoumi.log
	Chifoumi/Debug/Chifoumi.obj
	Chifoumi/Debug/Chifoumi.pch
	Chifoumi/Debug/Chifoumi.tlog/CL.read.1.tlog
	Chifoumi/Debug/Chifoumi.tlog/CL.write.1.tlog
	Chifoumi/Debug/Chifoumi.tlog/Chifoumi.lastbuildstate
	Chifoumi/Debug/Chifoumi.tlog/cl.command.1.tlog
	Chifoumi/Debug/Chifoumi.tlog/link.command.1.tlog
	Chifoumi/Debug/Chifoumi.tlog/link.read.1.tlog
	Chifoumi/Debug/Chifoumi.tlog/link.write.1.tlog
	Chifoumi/Debug/stdafx.obj
	Chifoumi/Debug/vc120.idb
	Chifoumi/Debug/vc120.pdb
	Debug/Chifoumi.exe
	Debug/Chifoumi.ilk
	Debug/Chifoumi.pdb