v1 complete
Merge branch 'master' of https://github.com/kingrobideau/fantasy_baseball

Conflicts:
	db/connect.py
	db/fangraphs_scraper.py
	db/mysql_tables.sql
	ui/index.html
	ui/js/angular.js
	ui/php/config.php
	ui/php/mysqli_connect.php