Minor Changes

Fixed areas where data wasn’t being pulled properly
Changed style of MySQLi Statements
Worked a bit on friends
Merge branch 'master' of https://github.com/navrav/RedWedding

Conflicts:
	feed.php