Tested Parsing
Merge branch 'without-pipes' of https://github.com/dgier/EECS-678-Project1 into without-pipes

Conflicts:
	main.c
ignore if possible