getting files
getting files
testy
test
test
work it
pulling
Merge branch 'master' of https://github.com/whoarethebritons/WiFile

Conflicts:
	app/src/main/res/layout/activity_filelist.xml
pulling
test
prepare checkbox
idea issues again
machine conflicts should be gone now
checkbox
trying to commit again
removing files
meh
meh
meh
meh