We spent some time examining the files that each team member edited, and decided which files we liked best and worked the best for the output we wanted for the Button Block. I uploaded my documents in our GitHub as the master file. This file will be our reference for now on.

After all of that was figured out, Ed wanted to add a new library to the Arduino IDE. 

First, I had to create a new .jar file out of our master ardublock file using the command line (cd into the ardublock-all folder then invoke mvn clean package). Then, I created an Arduino/tools/ArduBlockTool/tool folder to my Documents, uploaded my newly generated ardublock-all.jar to the tool folder, downloaded the NewPing library from this link, and finally copied it into the libraries folder of Arduino and followed instructions on the site. 

Next time I will see if I can get the NewPing library to automatically download with the rest of the Arduino libraries.

-C