[Tak] Model Almost done
Merge branch 'master' of github.com:phlip9/txtcoin

Conflicts:
	.gitignore

merge!