fixed conflicts

BagOfWords.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 '''
 Bag Of Words
 ============
@@ -162,4 +164,4 @@ class BagOfWords:
         # transform list to set to eliminate duplicates
         stop_words = set(stop_words)
 
-        return stop_words
+        return stop_words

README.md

@@ -10,4 +10,4 @@ graphviz==0.9
 scikit_learn==0.19.2
 
 # Installation under (UBUNTU?)
-apt-get install XX
+apt-get install XX

Starter.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 '''
 Starter
 =============
@@ -29,4 +31,4 @@ dataset = CsvHandler.read_csv(file)
 NaiveBayes.make_naive_bayes(dataset)
 # SVM.make_svm(dataset)
 
-print('# ending program')
+print('# ending program')