Merge pull request #1 from adanmoran/master

Re-syncing
Created weightedAvg.m

Finds the weighted average between two numbers.
Merge pull request #1 from chriskopher/master

Added weightedAvg.m, which calculates the weighted average of two numbers. This will be the final edge-weight of our graph.