yml updated
updated package.json
fixed the getfriends functionality to properly get all friends from database
Merge pull request #29 from faridonfire/master

fixed the getfriends functionality to properly get all friends from data...
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy
Merge branch 'master' of https://github.com/janaspage/moviebuddy into janaspage-master

Conflicts:
	app/scripts/controllers/friends.js
	config/db_config.js
	config/handler.js
Beginnings of 'put' for outing update.
Merge pull request #31 from janaspage/master

Refactored outings' attendees.
Update FB API key.
Update FB API.
Joining outings now updates in DB.
Merge branch 'outings_join-fix'
Removed wayward console log.
Merging w/ new 'production'. Added bower comps & flipped crlf.
Removing 'dist' from gitignore.
Merge pull request #34 from janaspage/production

'dist' now removed from gitignore
Adding bower comps & dist.

B/c this is production (local host), not master (deployed).
Merge branch 'production' into outings-edit

Conflicts:
	app/scripts/controllers/outings.js