committing local changes
Merge branch 'master' of https://github.com/pwon460/Thesis-app
preferences.xml edit