things
michele fixing merge conflicts
Tamer is the MAN
removing blocks.pyc
main.py merge conflict