added parallelogram
fuck yeahhhh i did it
fixed conflicts
init
fixed conflicts