committing to find bugs
merged
committing before merge
merged
fixed bug with averages
merged