view and controller
view and controller done
Merge branch 'release0' of https://github.com/katherineimogene/get-a-smile into release0