Modified what the functionality includes
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
I have changed the word "mobile" to "web"
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
coded functionlaity for birthday
coded the functionality of birthday
I have added the php file that retrieves the message from awards.
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.
Merged
Fixed the quotations in the awards php file.
I have moved the ducoments into one documentation folder
The documents have been moved into one documentation folder.
deleted a file , needed to fix something.
Signed-off-by: Tumza0531 <limoraka@gmail.com>
created bug defect log, for tracking bugs found during testing.
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