new things , grunt serve, styles separated
merged