initial commit
Merge branch 'gh-pages' of github.com:kevinmarx/Building-Your-Robot-Butler-2013 into gh-pages

Conflicts:
	index.html