more stuff
Merge branch 'master' of github.com:dominionenterprises/chicken-dinner
Merge branch 'master' of github.com:dominionenterprises/chicken-dinner
Merge pull request #51 from rjh427/master

More updates