beginning proj2
finished merge