Removed grid and added discordance metric
Merge branch 'master' of https://github.com/geneva/RWTY