no updates
Merge branch 'master' of https://github.com/Jacke20/RaidStats

Conflicts:
	src/raid/MainFrame.java
	src/raid/TextReader.java