parser now differentiates between files and directories fix:25
Merge branch 'master' of https://github.com/trevs231/eece-315-proj2 into workload_parser_branch