documentation cont.
	Merge branch 'master' of github.com:micky686/Esen2012 into platform

Conflicts:
	docs/protocol/protocol.tex
lcd connected
buttons connected
merged
convert added
Merge branch 'platform' of https://github.com/micky686/Esen2012 into platform
conclusion
Merge branch 'platform' of github.com:micky686/Esen2012 into platform
merging
files changed
results in progress
timeline