fix gitignore
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	instapix/admin.pyc
	instapix/management/commands/parsemosaics.pyc
	instapix/models.pyc
	instapix/views.pyc
Merge branch 'master' of https://github.com/alenoir/instamoz
Merge branch 'master' of https://github.com/alenoir/instamoz
static in gitignore
fix
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	.gitignore
	Instamoz/settings.pyc
	instamoz.sqlite3
	instapix/management/commands/parsemosaics.pyc
	instapix/migrations/0010_auto__add_subscription.pyc
	instapix/migrations/0011_auto__add_field_subscription_last_update__chg_field_subscription_user_.pyc
	instapix/migrations/0012_auto__add_field_subscription_object_id.pyc
	instapix/migrations/0013_auto__add_field_subscription_tag.pyc
	instapix/migrations/0014_auto__chg_field_instapic_picture_id.pyc
	instapix/migrations/0015_auto__chg_field_instapic_location_lat__chg_field_instapic_location_nam.pyc
	instapix/models.pyc
Merge branch 'master' of https://github.com/alenoir/instamoz
Merge branch 'master' of https://github.com/alenoir/instamoz
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	instapix/models.pyc
fix
fix
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	instamoz.sqlite3
	instapix/models.pyc