updated css for forms
Merge branch 'master' into nate_branch
corrected conflict in index.html.haml