001-first
002-home
003-home
004-home
005-office
005-office
Merge branch 'master' into my-home

Conflicts:
	mydjango/settings.pyc
006-home
008-home
Merge branch 'my-home'

Conflicts:
	mydjango/settings.pyc
123-home
345-home
423-home
234-office
1556-office
Merge branch 'master' into my-home

Conflicts:
	mydjango/settings.pyc
1631-home
1634-home
1635-home
1636-home