Merge pull request #1 from Siacoin/master

Create LICENSE
Added Reed-Solomon encoding from a google repository
Merge pull request #2 from Siacoin/master

Merge stubs
Merge branch 'master' of http://github.com/jaked122/Sia
Made some of the encoding work. Seems fairly solid. Unfortunately, you do have
to keep around a lot of extra memory in order to do it properly(at least it
seems as such now).
Moved the reed-solomon encoding code to more clearly mark it as a submodule.
renamed variable (name already used in context)
Merge pull request #3 from Siacoin/master

Merge updates
Merge pull request #4 from Siacoin/master

Merge from update
Send NodeAlive in the StateSwarmInformed correctly
Merge branch 'master' of github.com:Siacoin/Sia
this is the header

this is all of the explanation text
asdf
Defined a few methods for managing a file.
Merge branch 'master' of https://github.com/jaked122/Sia
This is a commit title

this is the body of the commit, it can be significantly longer
removing example.txt
Adding Wallets.go
Added HeartbeatTransaction and related functions
Merge github.com:c00w/Sia into Heartbeat

Conflicts:
	src/swarm/swarm.go