commit before pull
Merge branch 'master' of https://github.com/Redyrxela/SWSE
integrating filefinder activity
refined integration of filefinderactivity. Also began work on setting data from xml
Merge branch 'master' of https://github.com/Redyrxela/SWSE

Conflicts:
	.gitignore
	src/com/project/NuesoftG6/Page1.java
	src/com/project/NuesoftG6/mainActivity.java