free
conflict solved
Kevin scripts added
intial commit
not sure what this is
Merge remote-tracking branch 'origin/kevin' into django17