xz 4e eto bilo
Merge branch 'master' of https://github.com/alexdevid/devid into test

Conflicts:
	Gruntfile.js
	dist/css/style.css
	dist/js/app.js
	index.html
	package.json
	src/js/application.js
	src/scss/_project.scss
	src/templates/_contact.twig
	src/templates/data.json
	src/templates/index.twig