Test RUNNING and NOT PASSING - WKB
Tests are actually running - WKB
got DNP3 beginning message recognized WKB
Merge branch 'dev' into DataLinkLayer

Conflicts:
	source code/PowerDecoder/Django Webpage/BitSlice.py
	source code/PowerDecoder/Django Webpage/manage.py
	source code/PowerDecoder/Django Webpage/power_decoder/settings.py
	source code/PowerDecoder/Django Webpage/power_decoder/tests.py
Merge branch 'dev' into DataLinkLayer

Conflicts:
	source code/PowerDecoder/Django Webpage/DNP3/tests.py
	source code/PowerDecoder/Django Webpage/power_decoder/settings.py
DataLinkLayer - All test passing.  This branch is basically done
Website refined, background solved, alerts active, text change, pics
Updated the website for next release, be weary though, a warning about the jquery file, xx.xxx.js, git said is had to replace cl  with clrs or something simliar to that effect.
Initially altered CSV file, small javascript research file for testing and learning purposes, and the initial script of creating a 2D python dictionary object, currently though, only reads the data, but will soon become a dictionary object with next push.
Dictionary object is functional but will probably need to be tweaked to match specifications of the project for later use...
Began work on report Builder WKB
Working version of the dict creator, only question left is what data should the user be able to extract easily and what data should if needed, be shaved off...
reportBuilder - Misc changes to save before I switch branches WKB
Merge branch 'dev' into reportBuilder
Audited materials, and rearranged folder contents so that important source files aren't so difficult to reach, a note about the git add  though, warning: LF will be replaced by CRLF in source code/BitSlice.py.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/RunSite.bat.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/jquery/jquery.cycle.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/jquery/jquery.js.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/power_decoder/BitSli
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/static/jquery/jquery
ll.js.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/static/jquery/jquery
The file will have its original line endings in your working directory.
removed deleted files
made dictionary work WKB
Merge branch 'sjarnag-StephenDev' into reportBuilder-Stephen

Conflicts:
	source code/BitSlice.py
	source code/DataLinkTranslator.py
	source code/power_decoder/dictScriptV2.py
updated script and tests to reflect new dict return
checked scripts, testing and scripts were okay but the data file had a additional unicode attachment, sovled this through the encoding option in notepad ++, selected the option unicode 8 without BOM.