Small changes
Merge branch 'master' of https://github.com/DannyB91/mywebsite

Conflicts:
	.gitignore
Secret key fix.