Added web ui for cost calc
Added web ui for cost calc
Resolve merge conflicts
Merge conflicts resuolved
Merge remote-tracking branch 'upstream/master'
Graphs all pretty now thanks to Mark's changes