Ignore student data and .zip files.
Fix merge conflict.