first commit
Merge branch 'master' of github.com:gotmayonase/omnidynem

Conflicts:
	.gitignore