Updated Partition
Merge branch 'master' of https://github.com/brthiess/morat
Updated Partitioning
Fixed Conflicts