test
Merge branch 'master' of https://github.com/Pandamacia/TwitchNotifier

Conflicts:
	.idea/workspace.xml