commit
Like and hover
Merge branch 'AngelaDev1' into ev-dev

Conflicts:
	css/blokkit.css
	index.html
	js/blokkit.js
changed a couple text