still working on tasks
Merge remote-tracking branch 'origin/master'

Conflicts:
	.brackets.json
	package.json
	src/styles/main.scss