pulling from github
pulling from github
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
pulling from github
getting rid of scaffolds.css.scss