Merge branch 'master' of
https://github.com/andrespires/innovation-day.git

Conflicts:
	InnovationDayNewAgeRetroArduino/src/main/java/ca/expedia/innovationday/newageretroarduino/service/ArduinoClient.java
	InnovationDayNewAgeRetroArduino/src/main/java/ca/expedia/innovationday/newageretroarduino/service/BrushTeethToBlindServiceImpl.java
Merge branch 'master' of
https://github.com/andrespires/innovation-day.git