Added new links view to Django site
Added Scratchpad view to Django site
Merge branch 'hotfix'

Conflicts:
	Scratchpad/Scratchpad/urls.py
	Scratchpad/Scratchpad/views.py