Committing changes from episode 3 and 4
Committing work done in episode 4
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle