Show user files working
Merge branch 'master' of https://github.com/qog314/prog3
"Working on getting files"
Fixed merge conflicts
Added "*.save" to .gitignore