Changes on gitingore
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Merge branch 'master' of git://github.com/coldsoul/django-blog
Add compression and correct display for mobiles
Merge branch 'master' of github.com:/coldsoul/django-blog

Conflicts:
	blogengine/settings.py