Adam: Changed a multi-catch to generic exception
Merge remote-tracking branch 'origin/Chris' into Chris
Merge remote-tracking branch 'origin/Chris' into Chris
Adam: Added some code to commit button
Added code to update file info on commit