Modify form design.
fix conflicts
Merge branch 'master' of github.com:litmon/css_puzzle
Fix index
Fix conflicts and Add login_link to layout.