about to merge some nastay conflicts
Merge branch 'master' of https://github.com/cjevning/cs247project
Merge branch 'master' of https://github.com/cjevning/cs247project
Merge branch 'master' of https://github.com/cjevning/cs247project
fixing merge on message handlebars