Merge branch 'master' of https://github.com/seanokeeffe/WorkoutButton

Conflicts:
lcd_test/lcd_test.ino