Merge pull request #2 from mchannon/master

#2: Third viewController