..
merged
Merge branch 'master' of https://github.com/andrew-evans/RubixCube

Conflicts:
	src/TableGenerator.java