Separated phases of matter from materials
Merge branch 'phases'