Add .gitignore
Fix folder structure
Set default settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Infinity/Infinity.v12.suo
	Infinity/bin/Debug/Infinity.exe
	Infinity/bin/Debug/Infinity.exe.config
	Infinity/bin/Debug/Infinity.pdb
	Infinity/bin/Debug/Infinity.vshost.exe.config
	Infinity/images/Thumbs.db
	Infinity/obj/Debug/Infinity.exe
	Infinity/obj/Debug/Infinity.pdb
	Infinity/obj/Debug/Infinity.vbproj.GenerateResource.Cache
	Infinity/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll
	My Project/Settings.Designer.vb
	My Project/Settings.settings