Merge branch 'master' of /home/student/OneDir-Team13 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Admin.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added functionality for admin to optionally delete user's files if user's account is to be deleted