Prepping for alpha beta...

Got the loop working that was giving me issues before. Now Im pretty to
get alpha beta working
Merge remote-tracking branch 'origin/master'

Conflicts:
	states.py

Just made some changes to states that conflicted with the commented
parts.