This is a commit title

this is the body of the commit, it can be significantly longer
removing example.txt
Adding Wallets.go
Merge branch 'master' of https://github.com/evanmt13/Sia

Conflicts:
	src/swarm/wallets.go

fixed merge conflicts