Merge pull request #2 from mchannon/master

#2: Third viewController
Merge pull request #3 from mchannon/2

Merge pull request #2 from mchannon/master