Fix
Merge branch 'master' of https://github.com/IrisNerve/iris

Conflicts:
	templates/assets/style.css