leap have 2 actions ish
merge omg
Merge branch 'master' of https://github.com/denper-0/M7012E

Conflicts:
	M7012E.sdf
	M7012E.suo
	M7012E.vcxproj
	M7012E.vcxproj.filters
	Main.cpp