merged cj file into hw3.py

1-5 is pretty much done shaped