i am committing after a long time
committing changeg resolving conflitsMerge branch 'master' of https://github.com/baabte/baabtraServices

Conflicts:
	Djproject/urls.py
	Djproject/urls.pyc
	myapp/views.pyc