making a new file
commit before merging
Merge branch 'master' of https://github.com/awiss/tetris-rl

Conflicts:
	rl.py
Finished putting things together. There are still some glitches that I need to work out, but I think I understand the root of many of the problems.