max blocksize increased, max units decreased
Increased block reward to 100
Timestamp changed
Changed max blocksize
Max Blocksize changed to 255mb
added genesis pubkey
did stuff

Conflicts:
	src/main.cpp
???

Conflicts:
	src/main.h
max blocksize increased, max units decreased

Conflicts:
	src/main.h
max blocksize increased, max units decreased

Conflicts:
	src/main.h
max blocksize increased, max units decreased

Conflicts:
	src/main.h
merkle byteswapped

Conflicts:
	src/main.cpp