==.gitignore==

Created a .gitignore file for my convenience. (*.txt, *.pyc)

==easyReg.py==

I updated the RegEntry class to contain the path to its parent key. I also updated the RegKey.populateEntries method to accomodate this change.
Removed the .gitignore because it caused issues with OSACT.
Merge branch 'master' of https://github.com/albinohat/easyReg
==.gitignore==

Added a .gitignore file for convenience. It currently only ignores all .txt and .pyc files.

==carmenSandiego.py==

Note to self, this name probably needs to change. Added two new classes which together contain a wealth of information pertaining to networks which a computer has connected to.

==easyReg.py==

I updated the RegEntry class to contain the path to its parent key. I also updated the RegKey.populateEntries method to accomodate this change.

==fileHistory.py==

Changed around some comments.

==General Comments==

I need to get off my butt and do some hardcore testing next week. That includes creating my unit tests for the existing modules.

Most of this information pertains to the last commit, but due to merging issues, I needed to commit changes. I'm putting this information here because I'd rather it be there two times rather than not at all.
I needed to rewrite the code in these files because I'm a moron and gitted myself into a ton of trouble earlier today with the previous commits.
Created a new function specially for copying files from one direcory to another
Created a function to copy cookies from internet Explorer
Created new centrial repository for all IE11 cached items including images, css, etc.
See previous commits. I suffered a major setback because I needed to git gud. Additional changes are below

==carmenSanDiego.py==

Reworked the 3 classes int he file to take a RegKey object. Their attributes get filled by looping through the RegEntry objects stored in the RegKey objects list_of_entries.

==General Comments==

The changes to the other files were all comments or moving lines for readablilty.
Merge branch 'master' of https://github.com/cifranix/OpenSourceArtifactollectionToolkit-OSACT-475_2141-Cifranic-Mercado-Simmonds-Voellmer
Edited comments and removed test code
Merge branch 'master' of https://github.com/kevinVoellmer/OpenSourceArtifactollectionToolkit-OSACT-475_2141-Cifranic-Mercado-Simmonds-Voellmer

Merge conflict resolved. Using ## comments for descriptions.

Conflicts:
	graveDigger.py
Added S.M.A.R.T. commands to forensicsviewer and added a unittests file.
Merge branch 'master' of https://github.com/QuantumParadox/OpenSourceArtifactollectionToolkit-OSACT-475_2141-Cifranic-Mercado-Simmonds-Voellmer
Merge pull request #11 from albinohat/master

Pull Request 2014-11-09 (excellent documentation of workload!)