i can't checkout
Merge branch 'master' of https://github.com/tyler-yates/Piety.git

Conflicts:
	src/main/scala/piety/PietDSL.scala
	src/main/scala/piety/PietDSLDemo.scala