updating branch
Merge branch 'feature/wireframing' of https://github.com/LoganArnett/crosstrackapp into feature/wireframing
updating from last commit on old machine
updating into logan file