Working on settings.
Working on settings.
fixed import bug
Chriss storyboard
'
new xml
newer xml
Merge branch 'chrisNewXML' into master_Andy1
back on track after merging chris and andy branches