Just test
test
Merge branch 'master' of https://github.com/Yakoo-/MSP430-OLED-SPI

Conflicts:
	.gitignore

Test 141218 0320