handling merge conflicts
fixed merge conflicts
resolving merge conflicts
merge conflict resolved
Implementation of styling

* added toggle animation
* added grid formatting
* tweaked margins
resolved merge conflict
Merge pull request #60 from keaty/master

Implementation of styling