test 5 BASE_DIR
test 6 BASE_DIR
test 7
test 7
Merge branch 'master' of https://github.com/flautist/mysite

Conflicts:
	article/urls.py