Merge pull request #1 from OSU-TBI-ID/master

initial merge
work from wednesday night
Merge pull request #2 from ahmadkfarag/testAhmad

Merging the initial work on Settings page.