deleted local Qt creator config file
merged changes
Merge branch 'master' of github.com:Yukee/finite-volume