added lcd
automerge sucks
Conflicts:
	LCD/LCD.atsuo
	LCD/LCD/LCD.cpp
	LCD/LCD/LCD.cppproj
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2001