try pull
as
Merge branch 'master' of https://github.com/Cieszlunek/WifiFragmentNotepad

Conflicts:
	src/com/example/wififragmentnotepad/MainActivity.java