update
jquery form
update
Merge branch 'gh-pages'

Conflicts:
	.DS_Store
	May_Sabra_Project2/Bronze/.DS_Store
	May_Sabra_Project2/Gold/css/.DS_Store