Merge pull request #20 from wbattestilli/master

updated up_n_down from whb; blink changes, SOS added, lock added