Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:jim17/mooltipass
Merge branch 'master' of https://github.com/limpkin/mooltipass
Merge pull request #37 from abbeman/master

Fix header name mismatch
Update flash library to use SPI library, add void * support, refactor
Revert "Update flash library to use SPI library, add void * support, refactor"

This reverts commit f5617b9ec841c1cf722177939f654b8b0739b9da.
Update FLASH to use spi, support arbitrary data pointers via void *
Merge pull request #38 from harlequin-tech/master

Update flash library to use SPI library, add void * support, refactor
tricking git
tricking git
tricking git
switching to lower cases for entropy files
splitting defines.h contents
removing tabs
changing defines for better portability
update doc
changing defines for better portability
adding contest pictures
adding refined designs