made a backup of master and copied files over that involved with the second view controller.
Merge branch 'master' of https://github.com/jinzo27/infoGrabr
fixing merge