GPU and CPU do not match
Merge branch 'master' of github.com:pcpratts/rootbeer-ex

Conflicts:
	hist/lib/Rootbeer.jar