small changes
tracked test.py
just merge conflicted everything from repo now commiting