Create README.md
Update README.md and add settings/local.py file
Merge remote-tracking branch 'upstream/master'

Get the latest code
untrack settings/local.py file
Add homepage and related static files
fix urls.py to map new views
Add a few markup