cimmiting styles.css
Merge branch 'master' of https://github.com/DMarroquin94/SyntaxSugar_2

Conflicts:
	public/css/style.css