Merge pull request #8 from mc-server/master

Merge in new Core

CONTRIBUTORS

@@ -0,0 +1,11 @@
+Many people have contributed to MCServer, and this list attempts to broadcast at least some of them.
+
+faketruth (founder)
+xoft 
+keyboard
+STR_Warrior
+mgueydan
+tigerw
+bearbin
+
+If you feel you have contributed enough to be included in this list, just put in a PR including yourself.

LICENSE

@@ -0,0 +1,13 @@
+ Copyright MCServer Contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -12,7 +12,7 @@ To install MCServer, you can either download the repository and compile it, or d
 
 Compilation instructions are available in the COMPILING file.
 
-Linux builds can be downloaded from [the Berboe CI server](http://ci.berboe.co.uk) and windows from xoft's [nightly build service](mc-server.xoft.cz).
+Linux builds can be downloaded from [the Berboe CI server](http://ci.berboe.co.uk) and windows from xoft's [nightly build service](http://mc-server.xoft.cz).
 
 After you've extracted the files, simply run the MCServer executable.