Updates to main.py

- Use hx and hy instead of just h
Merge branch 'master' of https://github.com/dkong1796/ay190-final

Conflicts:
	main.py