Merge pull request #38 from DrkSephy/master

Adding new animations, items and effects
Fixed post-merging errors from pull request #38.
Fixing up animations