Merge conflict resolution
Starting to get directory_iterator implemented
Merge branch 'master' of github.com:jschmerge/xos

Conflicts:
	src/filesystem/directory_entry.cc