Changed nothing really
Making sure everything is up to date.
Merge branch 'master' of https://github.com/Xxmo13xx/halsey

Conflicts:
	spartan/AutoFiles/fileRetention.txt
	spartan/AutoFiles/inputDefaultDirectories.csv
	spartan/History/testFile/dateTime/03Jul/03Jul.txt
	spartan/History/testFile/dateTime/23Apr/23Apr.txt
	spartan/History/testFile/individual/BDKshit/BDKshit23Apr1502.txt
	spartan/History/testFile/individual/BDKshit/BDKshit23Apr1508.txt
	spartan/History/testFile/individual/Cory/Cory22Apr1801.txt
	spartan/History/testFile/individual/Hannah Kim/Hannah Kim22Apr1746.txt
	spartan/History/testFile/individual/JohnBertetto/JohnBertetto01Jul2141.txt
	spartan/History/testFile/individual/Kevin/Kevin11Jul0428.txt
	spartan/History/testFile/individual/Luke Saul/Luke Saul23Apr1502.txt
	spartan/History/testFile/individual/Luke Saul/Luke Saul23Apr1508.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul0834.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul0932.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul1008.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul1010.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul1014.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul1035.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul1054.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi03Jul1057.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi23Apr1502.txt
	spartan/History/testFile/individual/Nick Biancardi/Nick Biancardi23Apr1508.txt
	spartan/History/testFile/individual/The Viv/The Viv01Jul2141.txt
	spartan/History/testFile/individual/The Viv/The Viv08Apr1809.txt
	spartan/History/testFile/individual/The Viv/The Viv11Jul0429.txt
	spartan/History/testFile/individual/The Viv/The Viv22Apr1706.txt
	spartan/History/testFile/individual/The Viv/The Viv23Apr1502.txt
	spartan/History/testFile/individual/The Viv/The Viv23Apr1508.txt
	spartan/History/testFile/individual/Willie/Willie01Jul2141.txt
	spartan/History/testFile/individual/Willie/Willie22Apr1945.txt
	spartan/History/testFile/individual/Zesty/Zesty22Apr1651.txt
	spartan/History/testFile/individual/Zesty/Zesty22Apr1846.txt
	spartan/README.txt
	spartan/SNAKEv3.py
	spartan/SNAKEv3.pyc
	spartan/crawlEngine.py
	spartan/crawlEngine.pyc
	spartan/emailEngine.py
	spartan/emailEngine.pyc
	spartan/fileRetention.pyc
	spartan/gangsterFileParser.pyc
	spartan/history.pyc
	spartan/logfile.txt
	spartan/regularSNAKEData.txt
	spartan/settingsWindow.pyc
	spartan/targetIdFiles/modifiedTestFiles.csv