fix buton css error
Merge branch 'master' of github.com:Macj/crossroad
new view of form
conflict in form.css