David Falcon
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/build.gradle
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
David Falcon