refined upload, changed gallery, added several functions
Merge branch 'master' of github.com:Battleroid/sih

Conflicts:
	upload.php