Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
patching css
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'

Conflicts:
	blog/blog/static/css/main.css
Merge remote-tracking branch 'origin/master' into development