AMy's changes
Merge branch 'master' of https://github.com/amyjh/Makeover