merge
Merge branch 'master' of https://github.com/b0ralgin/WiMT

Conflicts:
	.DS_Store