Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	pyum/settings.py
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	pyum/settings.py
Create README.md
Merge branch 'origin/master'