Merge origin/master

This commit is contained in:
John Grosh
2017-05-18 19:59:57 -04:00

View File

@@ -1,6 +1,8 @@
# JMusicBot
A Discord music bot with a clean interface, and that is easy to set up and run yourself
[![Setup](http://i.imgur.com/VvXYp5j.png)](https://github.com/jagrosh/MusicBot/wiki/Setup)
# Features
* Easy to run (just make sure Java is installed, and run!)
* Fast loading of songs