"First Commit"
"App"
"New version of application"
New commit
Merge branch 'master' of github.com:henryaspegren/first_django_project

Conflicts:
	.DS_Store
	.gitignore
	db.sqlite3
	mysite/settings.py
	mysite/wsgi.py
	polls/templates/polls/index.html
	requirements.txt