add .log to gitignore
create messages model and parse incoming messages to determine if they are upc or words
Fix merge conflicts