fixed serialize.hpp
Merge remote-tracking branch 'upstream/master'
fixed cryptopp includes and gitignore problems
Merge pull request #41 from friederschueler/master

Cryptopp fix, better .gitignore, some file formatting to fit coding standards