mi commit2
Merge branch 'master' of https://github.com/Qaysen/Ribbit-Django

Conflicts:
	ribbit/ribbit/urls.py
Merge branch 'master' of https://github.com/Qaysen/Ribbit-Django
okkkk
Merge branch 'master', remote-tracking branch 'origin'