ignoring pyc files
ignoring joe backup files ~
initial migration b1
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	process/migrations/0001_initial.py