test
Merge branch 'master' of https://github.com/DaveTomlinson/pyga

Conflicts:
	test_pyga.py