Exam changes
Merged files
Added *.orig to ignore list