second commit

i am going to merge