Angelina tweaks styles, adds gifs, general fancy-ing
Resolve merge conflicts, update .gitignore