Merge commit from develop

DirectoryEntry.h

@@ -1,7 +1,9 @@
 #ifndef __DirectoryEntry_h__
 # define __DirectoryEntry_h__
 
-# include "includes"
+#include <dirent.h>
+#include <string>
+#include <string.h>
 
 namespace coreutils {
 
@@ -15,7 +17,19 @@ namespace coreutils {
       ~DirectoryEntry() {}
 
       std::string getName() {
-	       return std::string(entry.d_name);
+   	   return std::string(entry.d_name);
+      }
+
+      unsigned char getType() {
+	      return entry.d_type;
+      }
+
+      bool isFile() {
+	 return entry.d_type == DT_REG;
+      }
+
+      bool isDirectory() {
+	 return entry.d_type == DT_DIR;
       }
 
     private: