resolve conflict
merge VS2012 makefile for 64bits assembly
fix merge conflict
Merge pull request #93 from volvet/64bits_Support

64bits support for assembly codes.