. Bli?
Merge branch 'master' of github.com:Patapom/GodComplex

Conflicts:
	GodComplex.suo
	Tools.suo
. Worked a little on my shader converter