reverting
Merge branch 'master' of https://github.com/dinaalkhoury/first

Conflicts:
	config.xml
	index.html
	main.js