Homework 4.
Merge remote-tracking branch 'upstream/master'
Firebase database added