conflict3.0 to the max
Merge branch 'master' of https://github.com/Dinesh497/PROVEIT-AJAX

Conflicts:
	AjaxAgendaApp/ajaxtraining1.db