Merge branch 'development' of github.com:njaumc/njaumc.github.com into development

Conflicts:
	index.html
Merge branch 'development' of github.com:njaumc/njaumc.github.com into development