theme update
migrate from old site
meta tags
migrate from old site
images
google analytics
context handler
bug fix
bug fix
bug fix, padding for navbar
index page
text
heroku files
Merge remote-tracking branch 'refs/remotes/heroku/master' into drawthefuture

Conflicts:
	Procfile
	myproject/settings_local.py
	website/templates/index.html
moved files out of webfolder
ignore original images
missing script
html
new content
copy