merge with phalt

data/v2/__init__.py

@@ -1,5 +0,0 @@
-<<<<<<< Updated upstream
-from .build import *
-=======
-from build import *
->>>>>>> Stashed changes

pokemon_v2/migrations/0004_pokemonsprites.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pokemon_v2', '0003_auto_20160128_0523'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PokemonSprites',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('sprites', models.CharField(max_length=500)),
+                ('pokemon', models.ForeignKey(related_name='pokemonsprites', blank=True, to='pokemon_v2.Pokemon', null=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+    ]

pokemon_v2/models.py

@@ -1402,3 +1402,8 @@ class PokemonImageSet(HasPokemon):
   back_female = models.CharField(max_length=200, blank=True, null=True)
   back_shiny = models.CharField(max_length=200, blank=True, null=True)
   back_shiny_female = models.CharField(max_length=200, blank=True, null=True)
+
+
+class PokemonSprites(HasPokemon):
+
+  sprites = models.CharField(max_length=500)