Added location and description text fields to user page
Fixed User page
Merge branch 'master' of https://github.com/kayleyslane/Instafruit

Conflicts:
	userlookup.php