current
Merge branch 'master' of github.com:dvavrat/neot-cuda

Conflicts:
	contacts.php
	style.css
service specials -> technology