Merge branch 'master' into doug
possible layout
update
uncommitted changes error fix?"
Merge branch 'ian' into doug
fixed logout button
Merge branch 'ian1' into doug
solved logging out issue, modified tab names, created new settings view controller
new improvements
Merge branch 'ian'
additional modifications
…
added the form to place wishes, constants file…
Merge remote-tracking branch 'origin/master' into doug
added gitignore

to fix the ‘uncommitted change” error
updated gitignore