Merge branch 'master' of E:\me\computer\python\anbardari - git with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	anbar/views.py
1 shahrivar