fixing file path issues, more to come (the server shouldn't be storing every user's files in the same directory)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
XML comitting