preparing segues
Merge branch 'master' of https://github.com/flashBach/flashBachCode
preparing for segues
resolve merges