first commit
Merge branch 'master' of github.com:axskern/RoomMate
facebook api: get friends, push_notification
Merge branch 'master' of github.com:axskern/RoomMate
Merge branch 'master' of github.com:axskern/RoomMate
moved fb api back
push notification added to db.py
Merge branch 'master' of github.com:axskern/RoomMate
haversine fix
Merge branch 'master' of github.com:axskern/RoomMate

Conflicts:
	Backend/db.py