Move around styles and re-name scss sheets
Merge pull request #5 from magwalk/Maggie-Branch2

Move around styles and re-name scss sheets