balance
balancing stuff working and shit hax ftw
Merge branch 'balance' into develop