working on bugs
Merge remote-tracking branch 'origin/master'
added arrows and changed how we populate the screen
Merge remote-tracking branch 'origin/master'