some stuff
Merge branch 'master' of https://github.com/bernardito-luis/Jack

Conflicts:
	index.html
Minor changes