ozgartildi

ozgartildi
Merge remote-tracking branch 'origin/master'

Conflicts:
	Todo/settings.pyc
	katip.db
	katip/urls.py
	katip/urls.pyc
	katip/views.pyc