The login is working with wits proxy.
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
Login is working with the wits proxy. Deleted the index.html page.
Had to remove the netbeans files becase it was not merging.
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git

Conflicts:
	development/webapp/bbdcom/index.php
	development/webapp/bbdcom/menu.php
I added the updated proect plan
Merged