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 #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
Merge branch 'master' of https://github.com/limpkin/mooltipass
adding serigraphy
removed doxygen warning from aes
Merge branch 'master' of https://github.com/limpkin/mooltipass