Added a preference activity
Modified preference activity
merge confilicts
Merge branch 'master' of https://github.com/Kingram91/SENIOR_PROJECT