db delete
Merge branch 'master' of https://github.com/shsong97/django_blog

Conflicts:
	db.sqlite3
'dbfile'
Merge branch 'master' of https://github.com/shsong97/django_blog

Conflicts:
	db.sqlite3
some html code from korean to english
and login module changed