added lunch and trivia
Merge branch 'master' of github.com:foresterh/marvin