Merge pull request #9 from twitch2641/dev

Dev merge into master
Update version to 1.0.0
Update version to 0.1.0-alpha
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	version.txt