Attempt at stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/censoredsoftware/demigods/conversation/Prayer.java
Attempt at stuff.
Merge remote-tracking branch 'origin/master'