Updated MySQL guild to allow connections to MySQL server from OSU Network

Updated .gitignore to ignore some local files
Updated MySQL guild to allow connections to MySQL server from OSU Network

Updated .gitignore to ignore some local files
Merge branch 'master' of https://github.com/vfonte91/TaxiMap
Merge branch 'master' of https://github.com/vfonte91/TaxiMap

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/vfonte91/TaxiMap
Merge branch 'master' of https://github.com/vfonte91/TaxiMap
Merge branch 'master' of https://github.com/vfonte91/TaxiMap