deleted everything in static except fresh new bootstrap, made some changes in larry's python files, commented out a line in views.py, added some front end html
Merge branch 'master' of https://github.com/lmjackso/forensics

Conflicts:
	term_project/DFA/views.py