branching complete.Still to do mail upon branch
Merge branch 'master' of github.com:GEC2k10/APTS_django

Conflicts:
	guide/views.py
	urls.py