missing files
Merge branch 'master' of https://github.com/miguelquintas/jm

Conflicts:
	index.php