code style
Merge branch 'master' of https://github.com/vvaleron/my-personal-site

Conflicts:
	app/components/projects/charts/charts-paint-factory.js