fixed the infinite loop
Merge branch 'master' of github.com:brockjw/a6

Conflicts:
	tsh
im out