Added fileupload index and scope img main
Merge branch 'master' of https://github.com/brunoflora/elosparaisopolis

Conflicts:
	.DS_Store
	js/main.js