Weekly Update 4MAY14
Merge branch 'master' of https://github.com/froutson/JHS_CSE

Conflicts:
	index.html

fix index.html conflict