initial commit
refactor
almost completed
complete
Merge branch 'refs/heads/dev'

Conflicts:
	.gitignore