Merge remote-tracking branch 'origin/master'

# Conflicts: # README.md
BBoldt · Jan 20, 2016 · b13c745 · b13c745
2 parents e83b64e + a42f7fa
commit b13c745
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,13 @@
 # ThePioneers
 Experimental modpack for Forge 1.8.9
 
+<<<<<<< HEAD
 Releases are on the Releases page:
 https://github.com/BBoldt/ThePioneers/releases/
+=======
+# 0.6 Alpha (1.8.9!)
+https://github.com/BBoldt/ThePioneers/releases/tag/0.6.alpha
+>>>>>>> origin/master
 
 # Installation
 Can be installed as a multimc instance.