now worked
Merge branch 'master' of https://github.com/vmi356/filemanager

Conflicts:
	filesystem.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	filesystem.py
	manager.py
	templates/file_view.html