Updated gitignore, removed the backup file.
.gitignore update, added second_submission folder, added template_merge