drag&drop picture
Merge branch 'master' of https://github.com/jerryj1990/cosc360Project

Conflicts:
	bootstrap/profileInfo.php