lots o changes
Merge branch 'master' of https://github.com/dinaalkhoury/first

Conflicts:
	index.html
	jquery.js
	main.js