local
Merge branch 'master' of github.com:CoderDojoDC/CoderDojoDC.github.io

Conflicts:
	index.html
testing merge