Merge remote-tracking branch 'origin/master'

# Conflicts:
#	readme.md

readme.md

@@ -9,20 +9,17 @@ There are 2 main reasons I'm making this:
 1. I wanted to be able to check one or more existing seeds for resoureces and/or make maps of those resources.
 2. I wanted to make a non-spoiling way to select a good seed. (aka be sure it has some decent resources within a reasonable radius of spawn, without knowing where to go look)
 
-This program spits out json files, which can then be analyzed by hand or by an external program.
-I'm now working on some JavaScript (NodeJS) program to present the results and allow for custom filtering.
-
 License
 -------
 
-© 2015 - Dries007
+Unless otherwise specified per file, or per package via the package-info.java file:
 
-Unless otherwise specified per file, or per package via the package-info.java file.
+Copyright © 2015 - Dries007 - Available under [GPLv3](license.md)
 
-This program contains code from the [Terrafirmacraft mod](https://github.com/Deadrik/TFCraft), hence the GPL license.
+This program conains code from the [Terrafirmacraft mod](https://github.com/Deadrik/TFCraft).
 
 Done/Todo
----------
+----
 
 - [x] Make maps per layer + combined
 - [x] Multithreading
@@ -36,6 +33,10 @@ Done/Todo
 - [x] pH
 - [x] Drainage
 - [x] Add Gradle file and use it for dependecies
-- [ ] Add "hardcoded" tree generation (nearly impossible)
-- [ ] Crops (nearly impossible)
-- [ ] Animals (nearly impossible)
+- [ ] Seed rating system
+    - [ ] Requirements
+    - [ ] Instant rejections
+    - [ ] Score system
+- [ ] Add "hardcoded" tree generation
+- [ ] Crops
+- [ ] Animals