Bloggin and shit.
Merge conflicts are fun times.