Fixing branch
Merge branch 'dev' of https://github.com/tysweezy/demoRedesign into dev
Fixing things again