Changes Layout

Beginning the tutorial
Merge remote-tracking branch 'origin/master'

Conflicts:

	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/activity/BaseActivity.java