renamed variable (name already used in context)
Send NodeAlive in the StateSwarmInformed correctly
Merge branch 'master' of github.com:Siacoin/Sia
Added HeartbeatTransaction and related functions
Merge github.com:c00w/Sia into Heartbeat

Conflicts:
	src/swarm/swarm.go
Added unmarshaling ability to HeartbeatTransaction
MarshalString for HeartbeatTransaction now uses MarshalTransaction.
Modified UnmarshalTransaction to recognize the HeartbeatTransaction
struct (using "Heartbeat" as a temporary identifier, change if
confusing).
Fixed syntax errors
StateSwarmInformed Figures out if it should generate a block
Merge branch 'master' of github.com:c00w/Sia into Heartbeat
Merge branch 'master' of github.com:Siacoin/Sia

Conflicts:
	src/swarm/swarm.go
Generate an initial block and accept initial blocks
Merge branch 'master' of github.com:c00w/Sia into Heartbeat

Conflicts:
	src/swarm/swarm.go
Store blocks in blockchain
Merge branch 'master' of github.com:c00w/Sia into Heartbeat
Started StateSteady, minimally functional
Change State Interface to Return State from handleBlock
Merge pull request #1 from Jonbeek/Heartbeat

HeartbeatTransaction
Merge branch 'master' into swarm_initialization
Clean up steady state
Clean up heartbeat