Initial commit
initial upload
Merge branch 'master' of github.com:tdebruyn/myfirstsite
initial commit
Merge branch 'master' of github.com:tdebruyn/myfirstsite
Delete README
Modify Database parameters
Modify Database parameters
Modify Database parameters
Create polls app
Create model
Merge remote-tracking branch 'origin/master'

Conflicts:
	config
	manage.py
	myfirstsite/settings.py
Create model