effects
Merge branch 'master' of https://github.com/Grapheme/upk

Conflicts:
	www/static/css/main.css