Fixing merge conflict
 #2 Added basic form styling
Fixed conflict