Signed-off-by: areikusu <aleix.casanova@gmail.com>
Merge branch 'master' of https://github.com/areikusu/AndroidTraining.git

Conflicts:
	Rotacio0/res/layout-land/fragment_main.xml
	Rotacio0/res/layout/fragment_main.xml