add message queue, view displays oldest six messages and removes oldest if displayed more than 5 seconds ago
fix merge errors
add some code WIP
Merge branch 'master' of github.com:timjim/GA_hackathon