init project from Django layout
temp db
temp
add django docs to read
temp
temp
temp
temp
temp
add bower js package management tool
add init url hello world! but there's problem in it
Merge branch 'feature'

Conflicts:
	.gitignore
Merge branch 'django' of github.com:micfan/dinner

Conflicts: