"1.2.1 turned fire off by default"
Merge branch 'master' of https://github.com/delorenzo/Rebirth

Conflicts:
	Level 1/Library/ScriptAssemblies/Assembly-CSharp.dll
	Level 1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Level 1/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Level 1/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Level 1/Library/ScriptMapper
	Level 1/Library/assetDatabase3
	Level 1/Library/guidmapper
1.2.2

commit whateverthefuck is new to make git happy <3
"Fuck you git"
fixed merge conflicts.
"Fix yourself rebirth qqqqqqq"
"yay, maybe... many senseless commits"
"save me seannnnnnnnn"
uhhh
Fixed merges