Initial commit
ignore pyc
adding south
migrated to south
conflict resolved