Merge remote-tracking branch 'origin/new-design' into new-design

CHANGELOG.md

@@ -0,0 +1,5 @@
+**2.0.0**
+- Servers are now referenced by their name on the graph controls instead of their IP.
+- Servers now display their name on hover instead of their IP.
+- Graph controls are now saved and loaded automatically.
+- Moved server configuration into servers.json from config.json.

README.md

@@ -16,6 +16,9 @@ You can see an up-to-date copy of the master branch running on http://minetrack.
 Database logging is disabled by default. You can enable it in ```config.json``` by setting ```logToDatabase``` to true.
 This requires sqlite3 drivers to be installed.
 
+#### What's being changed?
+For the changelog, check out the [CHANGELOG](CHANGELOG.md) file.
+
 #### How do I get added?
 At the moment, the main "minetrack.me" site is only accepting networks that average roughly 1,000 players at peak for **PC** servers, and 100 players at peak for **PE** servers. This is due to limited capacity and it's functionality. If you fit this description, you're welcome to open a Pull Request adding the network to ```config.json```.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minetrack",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "A Minecraft server tracker that lets you focus on the basics.",
   "main": "app.js",
   "dependencies": {