commit
com
Merge branch 'master' of https://github.com/superphil0/cikebar

Conflicts:
	Assets/cikebar.unity
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/05/05c915519d2b1e94ba050ef043f7b738
	Library/metadata/23/2386955d8afdb7943af9c75b78f1f34d
	Library/metadata/51/51d579f60c1b3b143b0950bf80172f23
	cikebar-csharp.sln
	cikebar.sln
Merge branch 'master' of https://github.com/superphil0/cikebar
final commit
Merge branch 'master' of https://github.com/superphil0/cikebar
new