made changes to css, updated grunt libsass.
Merged work from Marrissa. Cleaned up organization of sass files.