deleted aux and log files
resolved conflict
Merge branch 'master' of https://github.com/altern/RELENG2014
Expanded on metrics
Merge pull request #3 from kbaileyky/master

More Metrics