Tims thing
Merge branch 'master' of https://github.com/jchilton1/fireside-chat.git