Olle trollar
Merge branch 'master' of https://github.com/Litheblas/litheblas

Conflicts:
	urls.py
Bort med lite slask

Conflicts:
	urls.py