Resolving merge conflicts
Merge Missed File
Merge branch 'master' of https://github.com/ehavlisch/TwitchBot

Conflicts:
	src/data/Rank.java
	src/main/EntriesController.java
	src/ui/GiveawaysPanel.java
	src/ui/GiveawaysTab.java