Settings page almost finished
Merge branch 'master' of https://github.com/ShahafZada/DASP.git