modified:   LoreAnimations/src/com/github/whitehooder/LoreAnimations/LoreAnimations.java
Merge branch 'master' of https://github.com/whitehooder/LoreAnimations

Conflicts:
	LoreAnimations/src/com/github/whitehooder/LoreAnimations/LoreAnimations.java

	modified:   LoreAnimations/src/com/github/whitehooder/LoreAnimations/LoreAnimations.java