added arithmetic_avg and weighted_avg
Merge branch 'master' of github.com:Schille/StockTrader
merge