Merge remote-tracking branch 'upsilon/nunit'

Conflicts:
	OpenTween.sln

diff --cc OpenTween.Tests/ApiInformationTest.cs
index 49198df,0000000..277f835
mode 100644,000000..100644
--- 1/OpenTweenTest/ApiInformationTest.cs
--- /dev/null
+++ b/OpenTween.Tests/ApiInformationTest.cs
@@@ -1,38 -1,0 +1,38 @@@
- namespace OpenTweenTest
 +// OpenTween - Client of Twitter
 +// Copyright (c) 2012      the40san <http://sourceforge.jp/users/the40san/>
 +// All rights reserved.
 +// 
 +// This file is part of OpenTween.
 +// 
 +// This program is free software; you can redistribute it and/or modify it
 +// under the terms of the GNU General public License as published by the Free
 +// Software Foundation; either version 3 of the License, or (at your option)
 +// any later version.
 +// 
 +// This program is distributed in the hope that it will be useful, but
 +// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 +// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General public License
 +// for more details.
 +// 
 +// You should have received a copy of the GNU General public License along
 +// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
 +// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
 +// Boston, MA 02110-1301, USA.
 +
 +using System;
 +using System.Collections.Generic;
 +using System.Linq;
 +using System.Text;
 +using System.Threading.Tasks;
 +using NUnit.Framework;
 +
 +
++namespace OpenTween
 +{
 +    [TestFixture]
 +    public class ApiInformationTest
 +    {
 +
 +
 +    }
 +}

diff --cc OpenTween.sln
index 5c3ab2b,eb10b3b..3bd7758
--- 1/OpenTween.sln
--- 2/OpenTween.sln
+++ b/OpenTween.sln
@@@ -1,9 -1,9 +1,9 @@@
  
 -Microsoft Visual Studio Solution File, Format Version 11.00
 -# Visual Studio 2010
 +Microsoft Visual Studio Solution File, Format Version 12.00
 +# Visual Studio 2012
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTween", "OpenTween\OpenTween.csproj", "{3D8995C7-BDF3-4273-9F9D-DDD902F6A101}"
  EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTweenTest", "OpenTweenTest\OpenTweenTest.csproj", "{62357129-9071-4191-ADAF-59ABE69F2472}"
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTween.Tests", "OpenTween.Tests\OpenTween.Tests.csproj", "{18A32642-A8F3-425B-978D-0C6F630EDDE8}"
  EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution