working to merge layout
Merge branch 'master' of https://github.com/latitude98/TakeBackApp into layout_edits
Merge branch 'master' into layout_edits
Merge branch 'master' of https://github.com/latitude98/TakeBackApp