* Now we can get Friends
Merge branch 'master' of github.com:rushton/MarkoPolo

Conflicts:
	app/scripts/controllers/main.js