added ls file
updated Makefile to compile ls
Added a bunch of stuff, need to fix source path, add directory prefix for files in directories that aren't the current one
fixed merge conflicts