Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	database.db
	main/models.py
	main/templates/main/home.html
	main/templates/main/profile.html
	main/views.py
Merge remote-tracking branch 'origin/master'