Atomics
Merge branch 'master' of github.com:dlwh/puck

Conflicts:
	src/main/java/puck/parser/gen/SimpleGenRuleMultiply.java