testing out branching
Creating my own branch
Branch testing
Merge remote-tracking branch 'origin/DavidVuBranch'
Branch testing
Merge remote-tracking branch 'origin/DavidVuBranch'
Database ER Diagram and workbench model

ER diagram and workbench model
ER Diagram changes

Changes to ER diagram
More changes to ER Diagram
Class Diagram and Database Changes

Partial Class Diagram for API and Database Schema Changes
updated ERD PNG to match Model

 Changes to be committed:
	modified:   Database/DatabaseModeling.mwb
	modified:   Database/DatabaseModeling.mwb.bak
	modified:   Database/ERDiagram.png
added additional classes and info

added additional classes and info
more updates

more updates
Added web client class diagrams
adding initial code for API Server
	new file:   API/api/log/access.log
	new file:   API/api/log/error.log
	new file:   API/api/pub/.htaccess
	new file:   API/api/pub/README
	new file:   API/api/pub/Rest.inc.php
	new file:   API/api/pub/api.php
	new file:   API/api/pub/apiconfig.php
	new file:   API/api/pub/controllers/UserController.php
	new file:   API/api/pub/models/User.php
Database changes

Made changes to database.
API and database changes

Reformatted the some of the existing php files. Started work on the team
php file and made some formatting changes to database model.
Fixed Code & Corrected formatting to group standards...

	modified:   API/api/pub/.htaccess
	modified:   API/api/pub/Rest.inc.php
	modified:   API/api/pub/api.php
	modified:   API/api/pub/apiconfig.php
	modified:   API/api/pub/controllers/UserController.php
	modified:   API/api/pub/models/Team.php
	modified:   API/api/pub/models/User.php
Database and API

Added more to the team model. Still working on it. Also created initial
import script for us to work with.
API

Committing team file.