First commit
Merge branch 'master' of github.com:strviola/SimpleBoard

Conflicts:
	Article/models.py
	Article/views.py
	SimpleBoard/settings.py
	templates/headline.html