styling forms
Merge branch 'master' of github.com:awanderingorill/snippets
fixed merge conflict