ZeGr33n
Merge remote-tracking branch 'origin/master'

Conflicts:
	visavsem/index.html
Merge remote-tracking branch 'origin/master'
ZeGr33n