Intent changes in main activity

small changes trying to get second activity to display info on 1st
activity
Merge branch 'master' into gh-pages