Merge pull request #7 from zackthehuman/master

Removed accidental git clone of hikari
Merge pull request #10 from zackthehuman/master

Added Squirrel and Sqrat libraries
Merge pull request #11 from zackthehuman/master

Added physfs, physfs-stream, and sfml as submodules
Merge pull request #12 from zackthehuman/master

Added Sqrat as submodule and fixed SFML bug
Merge pull request #13 from zackthehuman/master

Got rid of old Sqrat files
Merge pull request #14 from zackthehuman/master

Implemented basic scripting for effects (items)
Merge pull request #15 from zackthehuman/master

Added physfs as submodule
Merge pull request #16 from zackthehuman/master

Code cleanup, fixing null pointer checks, moving code around
Merge pull request #17 from zackthehuman/master

Added energy/weapon meters
Merge pull request #18 from zackthehuman/master

Messing with energy meter
Merge pull request #19 from zackthehuman/master

More energy meter work
Merge pull request #22 from zackthehuman/master

Code cleanup, added ItemFactory, added jsoncpp source files
Merge pull request #24 from zackthehuman/master

Added basic AnimationSetCache and tested it
Merge pull request #25 from zackthehuman/master

Animation set caching and item factory updates
Merge pull request #26 from zackthehuman/master

Scripting code cleanup (minor)
Merge pull request #27 from zackthehuman/master

Fixing Issue #3, adding client config object
Merge pull request #28 from zackthehuman/master

Code cleanup, scripting, old files removed, etc
Merge pull request #30 from zackthehuman/master

Code cleanup and fixes
Merge pull request #31 from zackthehuman/master

Added GME + more bugfix
Merge pull request #32 from zackthehuman/master

Bugfix