General Update

I forgot what I did here
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/disconsented/anssrpg/Main.java