reformatted less files, added some styling
merge conflict fix
Merge pull request #2 from jennywen/jenny

stylez!