changing around a bunch of files, adding a single script to run all python scripts
reduced logging noise
Merge branch 'develop' into fix_dbcreation_scripts

Conflicts:
	mySqlConnector.py
fix issue with unicode and nbsp
fix bad merge issue
Merge branch 'develop' into fix_dbcreation_scripts

Conflicts:
	.gitignore
	mySqlConnector.py
	pythonSetup/insertData.py
fix runtime merge conflicts, update script
forgot one file
script to combine teams in db
Merge pull request #18 from CST316TeamJ/fix_dbcreation_scripts

changing around a bunch of files, adding a single script to run all python scripts
Merge branch 'Task-943' of https://github.com/CST316TeamJ/SportsApp into Task-943
Added phplint and the static analysis of all php.
fix unicode issue mysqlconnector
Merge pull request #38 from CST316TeamJ/Task-943

script to combine teams in db,
one test failure that is fixed in another branch
fix merge conflicts
InsertPollCalcs completed, db updated properly