Author: Roza
Merge branch 'master' of https://github.com/itc2014/vmallsco

Conflicts:
	general.html
	js/script.js