better makeup
makeup
font awesome bootstrap
fix margin
fix merge
Merge pull request #14 from itbeaver/feature/accept-makeup

Feature/accept makeup
fix merge