all styles will be in style.css
Merge remote-tracking branch 'origin/master'