DiamondSwordDev/Runecraft — pull request #7 by Nathan2055 (2013-07-30 15:13:22+00:00)
Title: Just have one master branch

It seems like we're over thinking this by having two branches. When we're ready to release, we'll just tag it.