Push web
Merge branch 'master' of https://github.com/L1F3/KuPRA

Conflicts:
	src/main/webapp/resources/main.css