Merge branch 'master' of /home/student/OneDir-Team13 with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added ability for admin to remove files when deleting a user
Added GUI capabilities to AdminGUI file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Admin.py
Add GUI capabilities to AdminGUI file
Add GUI capabilities to AdminGUI file