messed with pract.c
added a file
added s
shit happens
fixed merge conflict