Merge branch 'master' of https://github.com/dgleba/g2responsive

Conflicts:
	.gitignore