Merge pull request #37 from monicaedavidson/master

Merge with Master
Merge pull request #38 from monicaedavidson/button

Merge pull request #37 from monicaedavidson/master