Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary

Conflicts:
	Novacoin/CBlockStore.cs

diff --combined NovacoinTest/Program.cs
index 3ccddf4,3ccddf4..f374b3c
--- 1/NovacoinTest/Program.cs
--- 2/NovacoinTest/Program.cs
+++ b/NovacoinTest/Program.cs
@@@ -283,6 -283,6 +283,7 @@@ namespace NovacoinTes
  
              Console.WriteLine("{0} != {1} : {2}", hash1.ToString(), hash2.ToString(), hash1 != hash2);
              Console.WriteLine("{0} == {1} : {2}\n", hash2.ToString(), hash3.ToString(), hash2 == hash3);
++            
  
              /*
              /// Pre-09854c5 revisions were affected by integer overflow bug, this issue was caused by incorrect deserialization of input value. Below you can see an example, broken transaction and its normal version.
@@@ -293,11 -293,11 +294,11 @@@
              Console.WriteLine(txNoBug);
              */
  
--            /*
++            
              Console.WriteLine("Reading the block file...");
              var bs = new CBlockStore();
              bs.ParseBlockFile();
--            */
++            
  
              Console.ReadLine();
          }