commit for merging - added fb log-in
merge