commit update
Merge branch 'master' of https://github.com/andrii-frankiv/NG.git

Conflicts:
	index.html
	js/directives.js