Initial Commit
Merge branch 'master' of github.com:melliotfrost/frostware

Conflicts:
	.gitignore