Merge branch 'master' of github.com:pele-python/pele into frozen_hs
Merge branch 'master' of github.com:pele-python/pele into frozen_hs
add 2d frozen wrappings
Merge branch 'periodic2D' of https://github.com/smcantab/pele into frozen_hs
add cpp tests for 2d hs wca frozen
Merge remote-tracking branch 'upstream/master' into newfrozen2d_2
Merge pull request #41 from kjs73/newfrozen2d_2

frozen 2d HS + WCA