Merge pull request #1 from XoderZ/development

Development
Updated README
Whoopsie!
Changed some stuff for shoutcast module.
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Update README.md
Merge remote-tracking branch 'origin/development'

Conflicts:
	README.md
Update README.md
Merge pull request #2 from XoderZ/master

Conflicting files