Update layout and colors
Update layout and colors
Merge branch 'master' of https://github.com/ivanzhaowy/Adonis

Conflicts:
	sass/form.scss
Merge pull request #12 from ivanzhaowy/master

Update layout and colors