added LED ring
added LED ring
Update main.cpp
Update main.h
Merge branch 'master' of github.com:swarage/612-2013

Conflicts:
	main.h