add the styles and javascripts
finish the styles and javascripts
finish the styles and javascripts
finish the styles and javascripts
merge dev