my first commit
testar
Merge remote-tracking branch 'origin/master'

Conflicts:
	messageboard/views/user.py