Implemented upload button
Implemented upload button
Merge branch 'master' of https://github.com/rpeng/makeup-hackathon