first commit
changes to fix mercurial and added django bs4
fixed merge