35: User accounts settings page (In progress)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	checkout/forms.py
	checkout/urls.py
	checkout/views.py
	templates/base.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/base.html
35: created form and menu link, but have not customized the template yet