updated gitignore
updated
updated gitignore
updated gitignore
scan timed_out does not need to return time passed so far; don't use default max time when calling timed_out from views, but specify the value there
/
resolved conflict in models.py