continue changing default values
dynamic text
Merge branch 'master' of https://github.com/CST316TeamJ/SportsApp into develop
Merge branch 'master' into develop

Conflicts:
	SampleDrawer/gen/com/cst316/SportsApp/R.java
	SampleDrawer/res/layout/activity_main.xml
	SampleDrawer/src/com/cst316/SportsApp/MainActivity.java
clean up files
Merge branch 'master' into develop

Conflicts:
	.gitignore
early design for bot prediction page
progress commit
Basic html/php skeleton with Hello World to test and see if server displays the webpage.
Adding .gitignore
Verion 1.0: Conference class with methods to loadTeams and getTeams used in upcoming games view to populate a table with the teams that will be facing eachother. EX: Team 1 and Team 16 in one row and so on.
Basic stubs created, some data verification, absolutely no formatting.
Forgot password pages/fields. Initial page is currently passing the username entered that we will use later to send an email. No styling currently. Task #661
Log In and Logged In pages
added user insertion into db
added check to db to reject registration if username exists
Some  database access for user pick view
Post-meeting
Version 1.1: With this version I was able to print 4 tables out for each conference. The data is still hard-coded with just the West conference into all the tables currently, once DB is set up we will have the tables be populated in order based on conference as the table structure has it set up. Need to also add clickable rows within the tables.
Table creation script#
Adding dbConnection.php to connect to a localhost sql server