Conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pl/byd/promand/Team3/MyActivity.java
Conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pl/byd/promand/Team3/MyActivity.java