test commit
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
Merge branch 'master' of https://github.com/rushilgoel/splitBill
Merge branch 'master' of https://github.com/rushilgoel/splitBill
Merge branch 'master' of https://github.com/rushilgoel/splitBill
Merge branch 'master' of https://github.com/rushilgoel/splitBill
changed paths to my paths
final commit for the night
Merge pull request #2 from lrettig/master

pull final code changes from pennapps 2012s