standard test files added
different sourcefile error handling
Merge commit '6c22eab' into assignment4
Merge commit '515f54f' into assignment4