Fixed attack timers, made oil/hp bar cooler, trees added
Merge branch 'master' of https://github.com/rikoophorst/ld31