updated to dev branch 

I had a merge conflict with one css I was working with. I fixed it and pushed in with no conflicts.