markdown
Merge branch 'master' of github.com:jefforulez/arduino_hacks

Conflicts:
	pumpkinbot2014/README