commiting changes so I can pull
Merge branch 'master' of https://github.com/LaunchAcademy/char_brawls
status update