Carp Tweeks
And again
Starting Dan's battle tweaks
Starting battle balancing
gitignore
Grr...
Made gitignore work
Added settings back to tracking
Misc fixes, Newsfeed improvement, Skill learning confirmation
More skills, buffs, battle tweaks
Adding missed classes
Balancing, buff visualization, more balancing
Images
Dumb stuff
more dumb
Merged Thomas
Adding back in buildpath
Added war/WEB_INF
Added war/WEB_INF
Merge branch 'Thomas'