Changed directory
Merge branch 'testing' of https://github.com/charmedxi/vfmcpp into testing
Added timing to log file