Changed data approach, made war recurse
Merge branch 'master' of github.com:dstelljes/war