imported analysis as new
Remove the now ignored directory analysis-doc.git
analysis-doc
Update demo.py
Changed files
Merge branch 'master' of https://github.com/Rbeaty88/analysis-doc
Test push

Simply put ##small edit## at the top of this file.
Merge branch 'master' of https://github.com/tburnett/analysis-doc

05647cd5b2e64d3acbe.

Conflicts:
	analyze/__init__.py
	analyze/_html.py
	analyze/analysis_base.py
	analyze/app.py
	analyze/demo.py
Update plot_index.html
Update plot_index.html
Update config.txt
Merge commit 'f7fa4069c6d789215fe3ee739a64ca3cee236d2e'
Merge remote-tracking branch 'upstream/master'
UPDATED
Merge remote-tracking branch 'upstream/master'
Adding table
Merge remote-tracking branch 'upstream/master'
Adding/Removing

Added ##Testing## and removed bad table.
Merge remote-tracking branch 'upstream/master'
Added back <html>, so it would work properly.