Merge pull request #1 from billyS/firstBranch

First branch
Merge pull request #2 from billyS/firstBranch

First branch
adding a menu and activities
blah
stripping it down a bit