inline edit push
m
merge branch 'bdbranch' of github.com:bdxhosting/test_ldh into bdbranch

Conflicts:
	db.sqlite3
	laurendennishair/settings.pyc