Solving conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Yacht/res/layout/activity_rules.xml
	Yacht/src/com/example/yacht/Rules.java