Test Ordr.in
removed *.pyc files
Removing .project and .pydevproject
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.project
	src/polls/__init__.pyc
	src/polls/admin.pyc
	src/polls/models.pyc
	src/polls/urls.pyc
	src/polls/views.pyc
	src/splitBill/__init__.pyc
	src/splitBill/settings.pyc
	src/splitBill/urls.pyc
	src/splitBill/wsgi.pyc
adding .project
Merge branch 'master' of https://github.com/rushilgoel/splitBill
Menu rendering
Merge branch 'master' of https://github.com/rushilgoel/splitBill
menu template files
Merge branch 'master' of https://github.com/rushilgoel/splitBill
form processing
Merge branch 'master' of https://github.com/rushilgoel/splitBill
changed paths to my paths