testing pushing since I've never been able to do it in my life
Merge branch 'master' of https://github.com/oconshien/cls_upper

Conflicts:
	Assets/Scenes/1.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper