Merge branch 'peter'
Merge branch 'peter'
Adding Travis CI YAML.
Update .md
Adding PIP detection
Fixing .yml?
Added requirements script for CI build reqs.
Oops...remove '.py' from YAML
Still messing with YAML
maybe a fix?
No comment
blah
yaml main.py
Seeing if commenting out a section will pass the build.
Take 2
Take 3
Don't remember...pushing anyway...
Done for tonight...tomorrow is a new day. I've been playing with getting
this program to install the MySQL Connector on Windows if it is not
already. Adjusted a few other things as well, but nothing major.
Merge branch 'master' of
https://github.com/pwalker91/CPUC--iPerfParser_with_DB_Storage.git

Conflicts:
	main.py
	submain_db.py
	submain_obj.py
Merge branch 'master' of https://github.com/pwalker91/CPUC--iPerfParser_with_DB_Storage